From 9147038defa859e42b999573b1279f90c5822c2f Mon Sep 17 00:00:00 2001 From: Alessio Vanni Date: Sun, 4 Oct 2020 18:33:13 +0200 Subject: Style changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jesús --- js/about.js | 167 +++++------ js/i18n.js | 7 +- js/pagestats.js | 186 ++++++------ js/storage.js | 471 +++++++++++++++-------------- js/udom.js | 905 +++++++++++++++++++++++++------------------------------- 5 files changed, 820 insertions(+), 916 deletions(-) diff --git a/js/about.js b/js/about.js index 17ff741..a35b45c 100644 --- a/js/about.js +++ b/js/about.js @@ -17,7 +17,7 @@ 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://libregit.spks.xyz/heckyel/ematrix + Home: https://gitlab.com/vannilla/ematrix uMatrix Home: https://github.com/gorhill/uMatrix */ @@ -25,123 +25,116 @@ 'use strict'; -/******************************************************************************/ +uDom.onLoad(function () { -uDom.onLoad(function() { - - /******************************************************************************/ - - var backupUserDataToFile = function() { - var userDataReady = function(userData) { + let backupUserDataToFile = function () { + let userDataReady = function (userData) { vAPI.download({ - 'url': 'data:text/plain,' + encodeURIComponent(JSON.stringify(userData, null, 2)), - 'filename': uDom('[data-i18n="aboutBackupFilename"]').text() + 'url': 'data:text/plain,' + + encodeURIComponent(JSON.stringify(userData, null, 2)), + 'filename': uDom('[data-i18n="aboutBackupFilename"]').text() }); - }; + }; - vAPI.messaging.send('about.js', { what: 'getAllUserData' }, userDataReady); + vAPI.messaging.send('about.js', { + what: 'getAllUserData' + }, userDataReady); }; - /******************************************************************************/ + let restoreUserDataFromFile = function () { + let validateBackup = function (s) { + let userData = null; - function restoreUserDataFromFile() { - var validateBackup = function(s) { - var userData = null; try { - userData = JSON.parse(s); + userData = JSON.parse(s); } catch (e) { - userData = null; - } - if ( userData === null ) { - return null; + userData = null; } - if ( - typeof userData !== 'object' || - typeof userData.version !== 'string' || - typeof userData.when !== 'number' || - typeof userData.settings !== 'object' || - typeof userData.rules !== 'string' || - typeof userData.hostsFiles !== 'object' - ) { - return null; + + if (userData === null + || typeof userData !== 'object' + || typeof userData.version !== 'string' + || typeof userData.when !== 'number' + || typeof userData.settings !== 'object' + || typeof userData.rules !== 'string' + || typeof userData.hostsFiles !== 'object') { + return null; } + return userData; - }; + }; - var fileReaderOnLoadHandler = function() { - var userData = validateBackup(this.result); - if ( !userData ) { - window.alert(uDom('[data-i18n="aboutRestoreError"]').text()); - return; + let fileReaderOnLoadHandler = function () { + let userData = validateBackup(this.result); + if (!userData) { + window.alert(uDom('[data-i18n="aboutRestoreError"]').text()); + return; } - var time = new Date(userData.when); - var msg = uDom('[data-i18n="aboutRestoreConfirm"]').text() - .replace('{{time}}', time.toLocaleString()); - var proceed = window.confirm(msg); - if ( proceed ) { - vAPI.messaging.send( - 'about.js', - { what: 'restoreAllUserData', userData: userData } - ); + let time = new Date(userData.when); + let msg = + uDom('[data-i18n="aboutRestoreConfirm"]') + .text() + .replace('{{time}}', time.toLocaleString()); + let proceed = window.confirm(msg); + if (proceed) { + vAPI.messaging.send('about.js', { + what: 'restoreAllUserData', + userData: userData + }); } - }; + }; - var file = this.files[0]; - if ( file === undefined || file.name === '' ) { + let file = this.files[0]; + if (file === undefined || file.name === '') { return; - } - if ( file.type.indexOf('text') !== 0 ) { + } + if (file.type.indexOf('text') !== 0) { return; - } - var fr = new FileReader(); - fr.onload = fileReaderOnLoadHandler; - fr.readAsText(file); + } + let fr = new FileReader(); + fr.onload = fileReaderOnLoadHandler; + fr.readAsText(file); } - /******************************************************************************/ - - var startRestoreFilePicker = function() { - var input = document.getElementById('restoreFilePicker'); - // Reset to empty string, this will ensure an change event is properly - // triggered if the user pick a file, even if it is the same as the last - // one picked. - input.value = ''; - input.click(); + let startRestoreFilePicker = function () { + let input = document.getElementById('restoreFilePicker'); + // Reset to empty string, this will ensure a change event is + // properly triggered if the user pick a file, even if it is + // the same as the last one picked. + input.value = ''; + input.click(); }; - /******************************************************************************/ - - var resetUserData = function() { - var proceed = window.confirm(uDom('[data-i18n="aboutResetConfirm"]').text()); - if ( proceed ) { - vAPI.messaging.send('about.js', { what: 'resetAllUserData' }); - } + let resetUserData = function () { + let proceed = + window.confirm(uDom('[data-i18n="aboutResetConfirm"]').text()); + if (proceed) { + vAPI.messaging.send('about.js', { + what: 'resetAllUserData' + }); + } }; - /******************************************************************************/ - - (function() { - var renderStats = function(details) { - document.getElementById('aboutVersion').textContent = details.version; - var template = uDom('[data-i18n="aboutStorageUsed"]').text(); - var storageUsed = '?'; - if ( typeof details.storageUsed === 'number' ) { - storageUsed = details.storageUsed.toLocaleString(); + (function () { + let renderStats = function (details) { + document.getElementById('aboutVersion') + .textContent = details.version; + let template = uDom('[data-i18n="aboutStorageUsed"]').text(); + let storageUsed = '?'; + if (typeof details.storageUsed === 'number') { + storageUsed = details.storageUsed.toLocaleString(); } document.getElementById('aboutStorageUsed').textContent = - template.replace('{{storageUsed}}', storageUsed); - }; - vAPI.messaging.send('about.js', { what: 'getSomeStats' }, renderStats); + template.replace('{{storageUsed}}', storageUsed); + }; + vAPI.messaging.send('about.js', { + what: 'getSomeStats' + }, renderStats); })(); - /******************************************************************************/ - uDom('#backupUserDataButton').on('click', backupUserDataToFile); uDom('#restoreUserDataButton').on('click', startRestoreFilePicker); uDom('#restoreFilePicker').on('change', restoreUserDataFromFile); uDom('#resetUserDataButton').on('click', resetUserData); - - /******************************************************************************/ - }); diff --git a/js/i18n.js b/js/i18n.js index 1c8945f..cf27a69 100644 --- a/js/i18n.js +++ b/js/i18n.js @@ -17,7 +17,7 @@ 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://libregit.spks.xyz/heckyel/ematrix + Home: https://gitlab.com/vannilla/ematrix uMatrix Home: https://github.com/gorhill/uMatrix */ @@ -76,6 +76,9 @@ // Firefox extension validator warns if using a variable as // argument for document.createElement(). // ηMatrix: is it important for us? + // ηMatrix (4.4.3 onwards): let's just use the variable and + // hope for the best, no need to have a redundant switch. + /* switch (text) { case 'b': return document.createElement('b'); @@ -96,6 +99,8 @@ default: break; } + */ + return document.createElement(text); }; let safeTextToTextNode = function (text) { diff --git a/js/pagestats.js b/js/pagestats.js index 2851df6..b4c65c1 100644 --- a/js/pagestats.js +++ b/js/pagestats.js @@ -17,25 +17,19 @@ 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://libregit.spks.xyz/heckyel/ematrix + Home: https://gitlab.com/vannilla/ematrix uMatrix Home: https://github.com/gorhill/uMatrix */ 'use strict'; -/******************************************************************************/ - ηMatrix.pageStoreFactory = (function() { Cu.import('chrome://ematrix/content/lib/UriTools.jsm'); - /******************************************************************************/ - - var ηm = ηMatrix; + let ηm = ηMatrix; - /******************************************************************************/ - - var BlockedCollapsibles = function() { + let BlockedCollapsibles = function () { this.boundPruneAsyncCallback = this.pruneAsyncCallback.bind(this); this.blocked = new Map(); this.hash = 0; @@ -43,16 +37,18 @@ }; BlockedCollapsibles.prototype = { - shelfLife: 10 * 1000, - add: function(type, url, isSpecific) { - if ( this.blocked.size === 0 ) { this.pruneAsync(); } - var now = Date.now() / 1000 | 0; - // The following "trick" is to encode the specifity into the lsb of the - // time stamp so as to avoid to have to allocate a memory structure to - // store both time stamp and specificity. - if ( isSpecific ) { + add: function (type, url, isSpecific) { + if (this.blocked.size === 0) { + this.pruneAsync(); + } + let now = Date.now() / 1000 | 0; + // The following "trick" is to encode the specifity into + // the lsb of the time stamp so as to avoid to have to + // allocate a memory structure to store both time stamp + // and specificity. + if (isSpecific) { now |= 0x00000001; } else { now &= 0xFFFFFFFE; @@ -60,45 +56,39 @@ this.blocked.set(type + ' ' + url, now); this.hash = now; }, - - reset: function() { + reset: function () { this.blocked.clear(); this.hash = 0; - if ( this.timer !== null ) { + if (this.timer !== null) { clearTimeout(this.timer); this.timer = null; } }, - - pruneAsync: function() { - if ( this.timer === null ) { - this.timer = vAPI.setTimeout( - this.boundPruneAsyncCallback, - this.shelfLife * 2 - ); + pruneAsync: function () { + if (this.timer === null) { + this.timer = vAPI.setTimeout(this.boundPruneAsyncCallback, + this.shelfLife * 2); } }, - - pruneAsyncCallback: function() { + pruneAsyncCallback: function () { this.timer = null; - var obsolete = Date.now() - this.shelfLife; - for ( var entry of this.blocked ) { - if ( entry[1] <= obsolete ) { + let obsolete = Date.now() - this.shelfLife; + for (let entry of this.blocked) { + if (entry[1] <= obsolete) { this.blocked.delete(entry[0]); } } - if ( this.blocked.size !== 0 ) { this.pruneAsync(); } + if (this.blocked.size !== 0) { + this.pruneAsync(); + } } }; - /******************************************************************************/ - // Ref: Given a URL, returns a (somewhat) unique 32-bit value // Based on: FNV32a // http://www.isthe.com/chongo/tech/comp/fnv/index.html#FNV-reference-source // The rest is custom, suited for uMatrix. - - var PageStore = function(tabContext) { + let PageStore = function (tabContext) { this.hostnameTypeCells = new Map(); this.domains = new Set(); this.blockedCollapsibles = new BlockedCollapsibles(); @@ -108,11 +98,10 @@ }; PageStore.prototype = { - collapsibleTypes: new Set([ 'image' ]), pageStoreJunkyard: [], - init: function(tabContext) { + init: function (tabContext) { this.tabId = tabContext.tabId; this.rawUrl = tabContext.rawURL; this.pageUrl = tabContext.normalURL; @@ -136,8 +125,7 @@ this.mtxCountModifiedTime = 0; return this; }, - - dispose: function() { + dispose: function () { this.rawUrl = ''; this.pageUrl = ''; this.pageHostname = ''; @@ -147,68 +135,70 @@ this.domains.clear(); this.allHostnamesString = ' '; this.blockedCollapsibles.reset(); - if ( this.incinerationTimer !== null ) { + if (this.incinerationTimer !== null) { clearTimeout(this.incinerationTimer); this.incinerationTimer = null; } - if ( this.pageStoreJunkyard.length < 8 ) { + if (this.pageStoreJunkyard.length < 8) { this.pageStoreJunkyard.push(this); } }, - - cacheBlockedCollapsible: function(type, url, specificity) { - if ( this.collapsibleTypes.has(type) ) { - this.blockedCollapsibles.add( - type, - url, - specificity !== 0 && specificity < 5 - ); + cacheBlockedCollapsible: function (type, url, specificity) { + if (this.collapsibleTypes.has(type)) { + this.blockedCollapsibles.add(type, + url, + specificity !== 0 + && specificity < 5); } }, + lookupBlockedCollapsibles: function (request, response) { + let tabContext = ηm.tabContextManager.lookup(this.tabId); + if (tabContext === null) { + return; + } - lookupBlockedCollapsibles: function(request, response) { - var tabContext = ηm.tabContextManager.lookup(this.tabId); - if ( tabContext === null ) { return; } - - var collapseBlacklisted = ηm.userSettings.collapseBlacklisted, - collapseBlocked = ηm.userSettings.collapseBlocked, - entry; + let collapseBlacklisted = ηm.userSettings.collapseBlacklisted; + let collapseBlocked = ηm.userSettings.collapseBlocked; + let blockedResources = response.blockedResources; - var blockedResources = response.blockedResources; + if (Array.isArray(request.toFilter) && request.toFilter.length !== 0) { + let roothn = tabContext.rootHostname; + let hnFromURI = UriTools.hostnameFromURI; + let tMatrix = ηm.tMatrix; - if ( - Array.isArray(request.toFilter) && - request.toFilter.length !== 0 - ) { - var roothn = tabContext.rootHostname, - hnFromURI = UriTools.hostnameFromURI, - tMatrix = ηm.tMatrix; - for ( entry of request.toFilter ) { - if ( tMatrix.mustBlock(roothn, hnFromURI(entry.url), entry.type) === false ) { + for (let entry of request.toFilter) { + if (tMatrix.mustBlock(roothn, + hnFromURI(entry.url), + entry.type) === false) { continue; } + blockedResources.push([ entry.type + ' ' + entry.url, - collapseBlocked || - collapseBlacklisted && tMatrix.specificityRegister !== 0 && - tMatrix.specificityRegister < 5 + collapseBlocked + || collapseBlacklisted + && tMatrix.specificityRegister !== 0 + && tMatrix.specificityRegister < 5 ]); } } - if ( this.blockedCollapsibles.hash === response.hash ) { return; } + if (this.blockedCollapsibles.hash === response.hash) { + return; + } response.hash = this.blockedCollapsibles.hash; - for ( entry of this.blockedCollapsibles.blocked ) { + for (let entry of this.blockedCollapsibles.blocked) { blockedResources.push([ entry[0], - collapseBlocked || collapseBlacklisted && (entry[1] & 1) !== 0 + collapseBlocked + || collapseBlacklisted + && (entry[1] & 1) !== 0 ]); } }, - - recordRequest: function(type, url, block) { - if ( block !== false ) { + recordRequest: function (type, url, block) { + if (block !== false) { this.perLoadBlockedRequestCount++; } else { this.perLoadAllowedRequestCount++; @@ -218,16 +208,20 @@ // - remember which hostname/type were seen // - count the number of distinct URLs for any given // hostname-type pair - var hostname = UriTools.hostnameFromURI(url), - key = hostname + ' ' + type, - uids = this.hostnameTypeCells.get(key); - if ( uids === undefined ) { + let hostname = UriTools.hostnameFromURI(url); + let key = hostname + ' ' + type; + let uids = this.hostnameTypeCells.get(key); + + if (uids === undefined) { this.hostnameTypeCells.set(key, (uids = new Set())); - } else if ( uids.size > 99 ) { + } else if (uids.size > 99) { + return; + } + + let uid = this.uidFromURL(url); + if (uids.has(uid)) { return; } - var uid = this.uidFromURL(url); - if ( uids.has(uid) ) { return; } uids.add(uid); // Count blocked/allowed requests @@ -241,17 +235,16 @@ // this.distinctRequestCount++; this.mtxCountModifiedTime = Date.now(); - if ( this.domains.has(hostname) === false ) { + if (this.domains.has(hostname) === false) { this.domains.add(hostname); this.allHostnamesString += hostname + ' '; this.mtxContentModifiedTime = Date.now(); } }, - - uidFromURL: function(uri) { - var hint = 0x811c9dc5, - i = uri.length; - while ( i-- ) { + uidFromURL: function (uri) { + var hint = 0x811c9dc5; + let i = uri.length; + while (i--) { hint ^= uri.charCodeAt(i) | 0; hint += (hint<<1) + (hint<<4) + (hint<<7) + (hint<<8) + (hint<<24) | 0; hint >>>= 0; @@ -260,18 +253,11 @@ } }; - /******************************************************************************/ - - return function pageStoreFactory(tabContext) { - var entry = PageStore.prototype.pageStoreJunkyard.pop(); - if ( entry ) { + return function (tabContext) { + let entry = PageStore.prototype.pageStoreJunkyard.pop(); + if (entry) { return entry.init(tabContext); } return new PageStore(tabContext); }; - - /******************************************************************************/ - })(); - -/******************************************************************************/ diff --git a/js/storage.js b/js/storage.js index c4447c4..f5afca8 100644 --- a/js/storage.js +++ b/js/storage.js @@ -17,7 +17,7 @@ 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://libregit.spks.xyz/heckyel/ematrix + Home: https://gitlab.com/vannilla/ematrix uMatrix Home: https://github.com/gorhill/uMatrix */ @@ -28,60 +28,52 @@ Components.utils.import('chrome://ematrix/content/lib/PublicSuffixList.jsm'); Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); -/******************************************************************************/ - -ηMatrix.getBytesInUse = function() { - var ηm = this; - var getBytesInUseHandler = function(bytesInUse) { +ηMatrix.getBytesInUse = function () { + let ηm = this; + let getBytesInUseHandler = function (bytesInUse) { ηm.storageUsed = bytesInUse; }; + // Not all WebExtension implementations support getBytesInUse(). - if ( typeof vAPI.storage.getBytesInUse === 'function' ) { + // ηMatrix: not really our business, but does it impact us? + if (typeof vAPI.storage.getBytesInUse === 'function') { vAPI.storage.getBytesInUse(null, getBytesInUseHandler); } else { ηm.storageUsed = undefined; } }; -/******************************************************************************/ - -ηMatrix.saveUserSettings = function() { - this.XAL.keyvalSetMany( - this.userSettings, - this.getBytesInUse.bind(this) - ); +ηMatrix.saveUserSettings = function () { + this.XAL.keyvalSetMany(this.userSettings, + this.getBytesInUse.bind(this)); }; -ηMatrix.loadUserSettings = function(callback) { - var ηm = this; +ηMatrix.loadUserSettings = function (callback) { + let ηm = this; - if ( typeof callback !== 'function' ) { + if (typeof callback !== 'function') { callback = this.noopFunc; } - var settingsLoaded = function(store) { + var settingsLoaded = function (store) { // console.log('storage.js > loaded user settings'); - ηm.userSettings = store; - callback(ηm.userSettings); }; vAPI.storage.get(this.userSettings, settingsLoaded); }; -/******************************************************************************/ - -ηMatrix.loadRawSettings = function() { - var ηm = this; +ηMatrix.loadRawSettings = function () { + let ηm = this; + let onLoaded = function (bin) { + if (!bin || bin.rawSettings instanceof Object === false) { + return; + } - var onLoaded = function(bin) { - if ( !bin || bin.rawSettings instanceof Object === false ) { return; } - for ( var key of Object.keys(bin.rawSettings) ) { - if ( - ηm.rawSettings.hasOwnProperty(key) === false || - typeof bin.rawSettings[key] !== typeof ηm.rawSettings[key] - ) { + for (let key of Object.keys(bin.rawSettings)) { + if (ηm.rawSettings.hasOwnProperty(key) === false + || typeof bin.rawSettings[key] !== typeof ηm.rawSettings[key]) { continue; } ηm.rawSettings[key] = bin.rawSettings[key]; @@ -92,131 +84,135 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); vAPI.storage.get('rawSettings', onLoaded); }; -ηMatrix.saveRawSettings = function(rawSettings, callback) { - var keys = Object.keys(rawSettings); - if ( keys.length === 0 ) { - if ( typeof callback === 'function' ) { +ηMatrix.saveRawSettings = function (rawSettings, callback) { + let keys = Object.keys(rawSettings); + if (keys.length === 0) { + if (typeof callback === 'function') { callback(); } return; } - for ( var key of keys ) { - if ( - this.rawSettingsDefault.hasOwnProperty(key) && - typeof rawSettings[key] === typeof this.rawSettingsDefault[key] - ) { + + for (let key of keys) { + if (this.rawSettingsDefault.hasOwnProperty(key) + && typeof rawSettings[key] === typeof this.rawSettingsDefault[key]) { this.rawSettings[key] = rawSettings[key]; } } - vAPI.storage.set({ rawSettings: this.rawSettings }, callback); + vAPI.storage.set({ + rawSettings: this.rawSettings + }, callback); this.rawSettingsWriteTime = Date.now(); }; -ηMatrix.rawSettingsFromString = function(raw) { - var result = {}, - lineIter = new Tools.LineIterator(raw), - line, matches, name, value; - while ( lineIter.eot() === false ) { - line = lineIter.next().trim(); - matches = /^(\S+)(\s+(.+))?$/.exec(line); - if ( matches === null ) { continue; } - name = matches[1]; - if ( this.rawSettingsDefault.hasOwnProperty(name) === false ) { +ηMatrix.rawSettingsFromString = function (raw) { + let result = {}; + let lineIter = new Tools.LineIterator(raw); + + while (lineIter.eot() === false) { + let line = lineIter.next().trim(); + let matches = /^(\S+)(\s+(.+))?$/.exec(line); + + if (matches === null) { + continue; + } + + let name = matches[1]; + if (this.rawSettingsDefault.hasOwnProperty(name) === false) { continue; } - value = (matches[2] || '').trim(); - switch ( typeof this.rawSettingsDefault[name] ) { + + let value = (matches[2] || '').trim(); + + switch (typeof this.rawSettingsDefault[name]) { case 'boolean': - if ( value === 'true' ) { + if (value === 'true') { value = true; - } else if ( value === 'false' ) { + } else if (value === 'false') { value = false; } else { value = this.rawSettingsDefault[name]; } break; case 'string': - if ( value === '' ) { + if (value === '') { value = this.rawSettingsDefault[name]; } break; case 'number': value = parseInt(value, 10); - if ( isNaN(value) ) { + if (isNaN(value)) { value = this.rawSettingsDefault[name]; } break; default: break; } - if ( this.rawSettings[name] !== value ) { + if (this.rawSettings[name] !== value) { result[name] = value; } } this.saveRawSettings(result); }; -ηMatrix.stringFromRawSettings = function() { - var out = []; - for ( var key of Object.keys(this.rawSettings).sort() ) { +ηMatrix.stringFromRawSettings = function () { + let out = []; + for (let key of Object.keys(this.rawSettings).sort()) { out.push(key + ' ' + this.rawSettings[key]); } return out.join('\n'); }; -/******************************************************************************/ - // save white/blacklist -ηMatrix.saveMatrix = function() { +ηMatrix.saveMatrix = function () { ηMatrix.XAL.keyvalSetOne('userMatrix', this.pMatrix.toString()); }; -/******************************************************************************/ - -ηMatrix.loadMatrix = function(callback) { - if ( typeof callback !== 'function' ) { +ηMatrix.loadMatrix = function (callback) { + if (typeof callback !== 'function') { callback = this.noopFunc; } - var ηm = this; - var onLoaded = function(bin) { - if ( bin.hasOwnProperty('userMatrix') ) { + + let ηm = this; + let onLoaded = function (bin) { + if (bin.hasOwnProperty('userMatrix')) { ηm.pMatrix.fromString(bin.userMatrix); ηm.tMatrix.assign(ηm.pMatrix); callback(); } }; + this.XAL.keyvalGetOne('userMatrix', onLoaded); }; -/******************************************************************************/ - -ηMatrix.listKeysFromCustomHostsFiles = function(raw) { - var out = new Set(), - reIgnore = /^[!#]/, - reValid = /^[a-z-]+:\/\/\S+/, - lineIter = new Tools.LineIterator(raw), - location; - while ( lineIter.eot() === false ) { - location = lineIter.next().trim(); - if ( reIgnore.test(location) || !reValid.test(location) ) { continue; } +ηMatrix.listKeysFromCustomHostsFiles = function (raw) { + let out = new Set(); + let reIgnore = /^[!#]/; + let reValid = /^[a-z-]+:\/\/\S+/; + let lineIter = new Tools.LineIterator(raw); + + while (lineIter.eot() === false) { + let location = lineIter.next().trim(); + if (reIgnore.test(location) || !reValid.test(location)) { + continue; + } out.add(location); } return Tools.setToArray(out); }; -/******************************************************************************/ - -ηMatrix.getAvailableHostsFiles = function(callback) { - var ηm = this, - availableHostsFiles = {}; +ηMatrix.getAvailableHostsFiles = function (callback) { + let ηm = this; + let availableHostsFiles = {}; // Custom filter lists. - var importedListKeys = this.listKeysFromCustomHostsFiles(ηm.userSettings.externalHostsFiles), - i = importedListKeys.length, - listKey, entry; - while ( i-- ) { - listKey = importedListKeys[i]; - entry = { + let importedListKeys = + this.listKeysFromCustomHostsFiles(ηm.userSettings.externalHostsFiles); + let i = importedListKeys.length; + + while (i--) { + let listKey = importedListKeys[i]; + let entry = { content: 'filters', contentURL: listKey, external: true, @@ -228,31 +224,41 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); } // selected lists - var onSelectedHostsFilesLoaded = function(bin) { + let onSelectedHostsFilesLoaded = function (bin) { // Now get user's selection of lists - for ( var assetKey in bin.liveHostsFiles ) { - var availableEntry = availableHostsFiles[assetKey]; - if ( availableEntry === undefined ) { continue; } - var liveEntry = bin.liveHostsFiles[assetKey]; + for (let assetKey in bin.liveHostsFiles) { + let availableEntry = availableHostsFiles[assetKey]; + if (availableEntry === undefined) { + continue; + } + + let liveEntry = bin.liveHostsFiles[assetKey]; availableEntry.off = liveEntry.off || false; - if ( liveEntry.entryCount !== undefined ) { + if (liveEntry.entryCount !== undefined) { availableEntry.entryCount = liveEntry.entryCount; } - if ( liveEntry.entryUsedCount !== undefined ) { + if (liveEntry.entryUsedCount !== undefined) { availableEntry.entryUsedCount = liveEntry.entryUsedCount; } + // This may happen if the list name was pulled from the list content - if ( availableEntry.title === '' && liveEntry.title !== undefined ) { + if (availableEntry.title === '' && liveEntry.title !== undefined) { availableEntry.title = liveEntry.title; } } // Remove unreferenced imported filter lists. - var dict = new Set(importedListKeys); - for ( assetKey in availableHostsFiles ) { - var entry = availableHostsFiles[assetKey]; - if ( entry.submitter !== 'user' ) { continue; } - if ( dict.has(assetKey) ) { continue; } + let dict = new Set(importedListKeys); + for (let assetKey in availableHostsFiles) { + let entry = availableHostsFiles[assetKey]; + if (entry.submitter !== 'user') { + continue; + } + + if (dict.has(assetKey)) { + continue; + } + delete availableHostsFiles[assetKey]; ηm.assets.unregisterAssetSource(assetKey); ηm.assets.remove(assetKey); @@ -262,60 +268,67 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); }; // built-in lists - var onBuiltinHostsFilesLoaded = function(entries) { - for ( var assetKey in entries ) { - if ( entries.hasOwnProperty(assetKey) === false ) { continue; } - entry = entries[assetKey]; - if ( entry.content !== 'filters' ) { continue; } + let onBuiltinHostsFilesLoaded = function (entries) { + for (let assetKey in entries) { + if (entries.hasOwnProperty(assetKey) === false) { + continue; + } + + let entry = entries[assetKey]; + if (entry.content !== 'filters') { + continue; + } availableHostsFiles[assetKey] = Object.assign({}, entry); } // Now get user's selection of lists - vAPI.storage.get( - { 'liveHostsFiles': availableHostsFiles }, - onSelectedHostsFilesLoaded - ); + vAPI.storage.get({ + 'liveHostsFiles': availableHostsFiles + }, onSelectedHostsFilesLoaded); }; this.assets.metadata(onBuiltinHostsFilesLoaded); }; -/******************************************************************************/ +ηMatrix.loadHostsFiles = function (callback) { + let ηm = ηMatrix; + let hostsFileLoadCount; -ηMatrix.loadHostsFiles = function(callback) { - var ηm = ηMatrix; - var hostsFileLoadCount; - - if ( typeof callback !== 'function' ) { + if (typeof callback !== 'function') { callback = this.noopFunc; } - var loadHostsFilesEnd = function() { + let loadHostsFilesEnd = function () { ηm.ubiquitousBlacklist.freeze(); - vAPI.storage.set({ 'liveHostsFiles': ηm.liveHostsFiles }); - vAPI.messaging.broadcast({ what: 'loadHostsFilesCompleted' }); + vAPI.storage.set({ + 'liveHostsFiles': ηm.liveHostsFiles + }); + vAPI.messaging.broadcast({ + what: 'loadHostsFilesCompleted' + }); ηm.getBytesInUse(); callback(); }; - var mergeHostsFile = function(details) { + let mergeHostsFile = function (details) { ηm.mergeHostsFile(details); hostsFileLoadCount -= 1; - if ( hostsFileLoadCount === 0 ) { + if (hostsFileLoadCount === 0) { loadHostsFilesEnd(); } }; - var loadHostsFilesStart = function(hostsFiles) { + let loadHostsFilesStart = function (hostsFiles) { ηm.liveHostsFiles = hostsFiles; ηm.ubiquitousBlacklist.reset(); - var locations = Object.keys(hostsFiles); + + let locations = Object.keys(hostsFiles); hostsFileLoadCount = locations.length; // Load all hosts file which are not disabled. - var location; - while ( (location = locations.pop()) ) { - if ( hostsFiles[location].off ) { + let location; + while ((location = locations.pop())) { + if (hostsFiles[location].off) { hostsFileLoadCount -= 1; continue; } @@ -323,7 +336,7 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); } // https://github.com/gorhill/uMatrix/issues/2 - if ( hostsFileLoadCount === 0 ) { + if (hostsFileLoadCount === 0) { loadHostsFilesEnd(); return; } @@ -332,11 +345,9 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); this.getAvailableHostsFiles(loadHostsFilesStart); }; -/******************************************************************************/ - -ηMatrix.mergeHostsFile = function(details) { - var usedCount = this.ubiquitousBlacklist.count; - var duplicateCount = this.ubiquitousBlacklist.duplicateCount; +ηMatrix.mergeHostsFile = function (details) { + let usedCount = this.ubiquitousBlacklist.count; + let duplicateCount = this.ubiquitousBlacklist.duplicateCount; this.mergeHostsFileContent(details.content); @@ -348,22 +359,20 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); hostsFilesMeta.entryUsedCount = usedCount; }; -/******************************************************************************/ - -ηMatrix.mergeHostsFileContent = function(rawText) { - var rawEnd = rawText.length; - var ubiquitousBlacklist = this.ubiquitousBlacklist; - var reLocalhost = /(^|\s)(localhost\.localdomain|localhost|local|broadcasthost|0\.0\.0\.0|127\.0\.0\.1|::1|fe80::1%lo0)(?=\s|$)/g; - var reAsciiSegment = /^[\x21-\x7e]+$/; - var matches; - var lineBeg = 0, lineEnd; - var line; +ηMatrix.mergeHostsFileContent = function (rawText) { + let rawEnd = rawText.length; + let ubiquitousBlacklist = this.ubiquitousBlacklist; + let reLocalhost = /(^|\s)(localhost\.localdomain|localhost|local|broadcasthost|0\.0\.0\.0|127\.0\.0\.1|::1|fe80::1%lo0)(?=\s|$)/g; + let reAsciiSegment = /^[\x21-\x7e]+$/; + let matches; + let lineBeg = 0, lineEnd; + let line; - while ( lineBeg < rawEnd ) { + while (lineBeg < rawEnd) { lineEnd = rawText.indexOf('\n', lineBeg); - if ( lineEnd < 0 ) { + if (lineEnd < 0) { lineEnd = rawText.indexOf('\r', lineBeg); - if ( lineEnd < 0 ) { + if (lineEnd < 0) { lineEnd = rawEnd; } } @@ -385,19 +394,19 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); // The filter is whatever sequence of printable ascii character without // whitespaces matches = reAsciiSegment.exec(line); - if ( !matches || matches.length === 0 ) { + if (!matches || matches.length === 0) { continue; } // Bypass anomalies // For example, when a filter contains whitespace characters, or // whatever else outside the range of printable ascii characters. - if ( matches[0] !== line ) { + if (matches[0] !== line) { continue; } line = matches[0]; - if ( line === '' ) { + if (line === '') { continue; } @@ -405,22 +414,18 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); } }; -/******************************************************************************/ - // `switches` contains the filter lists for which the switch must be revisited. - -ηMatrix.selectHostsFiles = function(details, callback) { - var ηm = this, - externalHostsFiles = this.userSettings.externalHostsFiles, - i, n, assetKey; +ηMatrix.selectHostsFiles = function (details, callback) { + let ηm = this; + let externalHostsFiles = this.userSettings.externalHostsFiles; // Hosts file to select - if ( Array.isArray(details.toSelect) ) { - for ( assetKey in this.liveHostsFiles ) { - if ( this.liveHostsFiles.hasOwnProperty(assetKey) === false ) { + if (Array.isArray(details.toSelect)) { + for (let assetKey in this.liveHostsFiles) { + if (this.liveHostsFiles.hasOwnProperty(assetKey) === false) { continue; } - if ( details.toSelect.indexOf(assetKey) !== -1 ) { + if (details.toSelect.indexOf(assetKey) !== -1) { this.liveHostsFiles[assetKey].off = false; } else if ( details.merge !== true ) { this.liveHostsFiles[assetKey].off = true; @@ -429,18 +434,17 @@ Components.utils.import('chrome://ematrix/content/lib/Tools.jsm'); } // Imported hosts files to remove - if ( Array.isArray(details.toRemove) ) { - var removeURLFromHaystack = function(haystack, needle) { - return haystack.replace( - new RegExp( - '(^|\\n)' + - needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + - '(\\n|$)', 'g'), - '\n' - ).trim(); + if (Array.isArray(details.toRemove)) { + let removeURLFromHaystack = function (haystack, needle) { + return haystack + .replace(new RegExp('(^|\\n)' + + needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + + '(\\n|$)', 'g'), + '\n').trim(); }; - for ( i = 0, n = details.toRemove.length; i < n; i++ ) { - assetKey = details.toRemove[i]; + + for (let i=0, n=details.toRemove.length; i ' + selector); - var i = nl.length; - while ( doesMatch === false && i-- ) { - doesMatch = nl[i] === node; - } - parentNode.removeAttribute('uDom-32kXc6xEZA7o73AMB8vLbLct1RZOkeoO'); - return doesMatch; - }; + } - /******************************************************************************/ + let doesMatch = false; + parentNode.setAttribute('uDom-32kXc6xEZA7o73AMB8vLbLct1RZOkeoO', ''); - DOMList.prototype.nodeAt = function(i) { - return this.nodes[i] || null; + let grandpaNode = parentNode.parentNode || document; + let nl = grandpaNode + .querySelectorAll('[uDom-32kXc6xEZA7o73AMB8vLbLct1RZOkeoO] > ' + + selector); + let i = nl.length; + while (doesMatch === false && i--) { + doesMatch = nl[i] === node; + } + parentNode.removeAttribute('uDom-32kXc6xEZA7o73AMB8vLbLct1RZOkeoO'); + return doesMatch; }; - DOMList.prototype.at = function(i) { - return addNodeToList(new DOMList(), this.nodes[i]); + DOMList.prototype.nodeAt = function (i) { + return this.nodes[i] || null; }; - /******************************************************************************/ - - DOMList.prototype.toArray = function() { - return this.nodes.slice(); + DOMList.prototype.at = function (i) { + return addNodeToList(new DOMList(), this.nodes[i]); }; - /******************************************************************************/ - - DOMList.prototype.pop = function() { - return addNodeToList(new DOMList(), this.nodes.pop()); + DOMList.prototype.toArray = function () { + return this.nodes.slice(); }; - /******************************************************************************/ + DOMList.prototype.pop = function () { + return addNodeToList(new DOMList(), this.nodes.pop()); + }; - DOMList.prototype.forEach = function(fn) { - var n = this.nodes.length; - for ( var i = 0; i < n; i++ ) { + DOMList.prototype.forEach = function (fn) { + let n = this.nodes.length; + for (let i=0; i