Remove obsolete assets

Related issue:
- https://github.com/vtriolet/writings/blob/main/posts/2021/ublock_origin_and_umatrix_denial_of_service.adoc

assets/assets.json

@@ -16,25 +16,6 @@
 			"assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat"
 		]
 	},
-	"malware-0": {
-		"content": "filters",
-		"title": "Malware Domain List",
-		"contentURL": [
-			"https://www.malwaredomainlist.com/hostslist/hosts.txt",
-			"assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt"
-		]
-	},
-	"malware-1": {
-		"content": "filters",
-		"title": "Malware domains",
-		"contentURL": [
-			"https://mirror.cedia.org.ec/malwaredomains/justdomains",
-			"https://mirror1.malwaredomains.com/files/justdomains",
-			"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains",
-			"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains.txt"
-		],
-		"supportURL": "http://www.malwaredomains.com/"
-	},
 	"dpollock-0": {
 		"content": "filters",
 		"updateAfter": 11,
@@ -45,25 +26,15 @@
 		],
 		"supportURL": "https://someonewhocares.org/hosts/"
 	},
-	"hphosts": {
-		"content": "filters",
-		"updateAfter": 11,
-		"title": "hpHosts’ Ad and tracking servers",
-		"contentURL": [
-			"https://hosts-file.net/.%5Cad_servers.txt",
-			"assets/thirdparties/hosts-file.net/ad_servers.txt"
-		],
-		"supportURL": "https://hosts-file.net/"
-	},
 	"mvps-0": {
 		"content": "filters",
 		"updateAfter": 11,
 		"title": "MVPS HOSTS",
 		"contentURL": [
-			"http://winhelp2002.mvps.org/hosts.txt",
+			"https://winhelp2002.mvps.org/hosts.txt",
 			"assets/thirdparties/winhelp2002.mvps.org/hosts.txt"
 		],
-		"supportURL": "http://winhelp2002.mvps.org/"
+		"supportURL": "https://winhelp2002.mvps.org/"
 	},
 	"plowe-0": {
 		"content": "filters",

dist/firefox/updates.json

@@ -3,10 +3,10 @@
   "uMatrix@raymondhill.net": {
    "updates": [
     {
-     "version": "1.4.1.4",
+     "version": "1.4.1.6",
      "browser_specific_settings": { "gecko": { "strict_min_version": "56" } },
-     "update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/1.4.1b4",
+     "update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/1.4.1b6",
-     "update_link": "https://github.com/gorhill/uMatrix/releases/download/1.4.1b4/uMatrix_1.4.1b4.firefox.signed.xpi"
+     "update_link": "https://github.com/gorhill/uMatrix/releases/download/1.4.1b6/uMatrix_1.4.1b6.firefox.signed.xpi"
     }
    ]
   }

dist/version

@@ -1 +1 @@
-1.4.1.5
+1.4.3.0

src/js/background.js

@@ -57,6 +57,8 @@ const rawSettingsDefault = {
     assetFetchBypassBrowserCache: false,
     assetFetchTimeout: 30,
     autoUpdateAssetFetchPeriod: 120,
+    cacheStorageAPI: 'unset',
+    cacheStorageCompression: true,
     cnameIgnoreList: 'unset',
     cnameIgnore1stParty: true,
     cnameIgnoreExceptions: true,
@@ -124,7 +126,7 @@ const rawSettingsDefault = {
             '</body></html>'
         ].join(''),
     framePlaceholderBackground: 'default',
-    suspendTabsUntilReady: false
+    suspendTabsUntilReady: 'unset'
 };
 
 /******************************************************************************/

src/js/cachestorage.js

@@ -119,7 +119,7 @@
                     disconnect();
                 },
                 Math.max(
-                    µMatrix.hiddenSettings.autoUpdateAssetFetchPeriod * 2 * 1000,
+                    µMatrix.rawSettings.autoUpdateAssetFetchPeriod * 2 * 1000,
                     180000
                 )
             );
@@ -296,7 +296,7 @@
             const promises = [ getDb() ];
             const entries = [];
             const dontCompress =
-                µMatrix.hiddenSettings.cacheStorageCompression !== true;
+                µMatrix.rawSettings.cacheStorageCompression !== true;
             const handleEncodingResult = result => {
                 entries.push({ key: result.key, value: result.data });
             };

src/js/codemirror/mode/raw-settings.js

@@ -23,7 +23,7 @@
 
 'use strict';
 
-CodeMirror.defineMode("raw-settings", function() {
+CodeMirror.defineMode('raw-settings', function() {
     return {
         token: function(stream) {
             if ( stream.sol() ) {

src/js/contentscript-no-inline-script.js

@@ -26,7 +26,7 @@
 // https://github.com/hackademix/noscript/commit/6e80d3f130773fc9a9123c5c4c2e97d63e90fa2a
 
 (function() {
-    let html = document.documentElement;
+    const html = document.documentElement;
     if ( html instanceof HTMLElement === false ) { return; }
 
     let meta;
@@ -45,8 +45,8 @@
     //
     // The CSP directive is enforced as soon as the meta tag is inserted:
     // > Enforce the policy policy.
-    let head = document.head,
+    const head = document.head;
-        parent = head;
+    let parent = head;
     if ( parent === null ) {
         parent = document.createElement('head');
         html.appendChild(parent);

src/js/main-blocked.js

@@ -87,7 +87,7 @@ uDom('.what').text(details.url);
         return s;
     };
 
-    const renderParams = function(parentNode, rawURL) {
+    const renderParams = function(parentNode, rawURL, depth = 0) {
         const a = document.createElement('a');
         a.href = rawURL;
         if ( a.search.length === 0 ) { return false; }
@@ -109,9 +109,9 @@ uDom('.what').text(details.url);
             const name = safeDecodeURIComponent(param.slice(0, pos));
             const value = safeDecodeURIComponent(param.slice(pos + 1));
             const li = liFromParam(name, value);
-            if ( reURL.test(value) ) {
+            if ( depth < 2 && reURL.test(value) ) {
                 const ul = document.createElement('ul');
-                renderParams(ul, value);
+                renderParams(ul, value, depth + 1);
                 li.appendChild(ul);
             }
             parentNode.appendChild(li);

src/js/popup.js

@@ -77,6 +77,11 @@ const resizePopup = (( ) => {
 
     // The purpose of `xobserver` is to initiate the resize handler only
     // when the popup panel is actually visible.
+
+    // https://github.com/uBlockOrigin/uMatrix-issues/issues/235
+    if ( self.IntersectionObserver instanceof Object === false ) {
+        return ( ) => { };
+    }
     let xobserver = new IntersectionObserver(intersections => {
         if ( intersections.length === 0 ) { return; }
         if ( intersections[0].isIntersecting === false ) { return; }

src/js/start.js

@@ -32,6 +32,11 @@
     ]);
     log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`);
 
+    const cacheBackend = await µm.cacheStorage.select(
+        µm.rawSettings.cacheStorageAPI
+    );
+    log.info(`Backend storage for cache will be ${cacheBackend}`);
+
     const shouldWASM =
         vAPI.canWASM === true &&
         µm.rawSettings.disableWebAssembly !== true;

src/js/storage.js

@@ -496,9 +496,19 @@ self.addEventListener('rawSettingsChanged', ( ) => {
     const addedCount = this.ubiquitousBlacklistRef.addedCount;
     const addCount = this.ubiquitousBlacklistRef.addCount;
 
-    this.mergeHostsFileContent(details.content);
+    // https://www.reddit.com/r/uMatrix/comments/ftebgz/
+    //   Be ready to deal with a removed asset.
+
+    if ( typeof details.content === 'string' && details.content !== '' ) {
+        this.mergeHostsFileContent(details.content);
+    }
 
     const hostsFileMeta = this.liveHostsFiles.get(details.assetKey);
+    if ( hostsFileMeta === undefined ) {
+        this.liveHostsFiles.delete(details.assetKey);
+        return;
+    }
+
     hostsFileMeta.entryCount =
         this.ubiquitousBlacklistRef.addCount - addCount;
     hostsFileMeta.entryUsedCount =

tools/make-assets.sh

@@ -14,11 +14,14 @@ cp ./assets/assets.json $DES/
 if [ -n "${TRAVIS_TAG}" ]; then
   pushd .. > /dev/null
   git clone --depth 1 https://github.com/uBlockOrigin/uAssets.git
+  git checkout 84dc2761abb4193bb34290aa6d90266610f735f6
   popd > /dev/null
 fi
 
 mkdir $DES/thirdparties
-cp -R ../uAssets/thirdparties/hosts-file.net             $DES/thirdparties/
+pushd ../uAssets
+git checkout 84dc2761abb4193bb34290aa6d90266610f735f6
+popd
 cp -R ../uAssets/thirdparties/mirror1.malwaredomains.com $DES/thirdparties/
 cp -R ../uAssets/thirdparties/pgl.yoyo.org               $DES/thirdparties/
 cp -R ../uAssets/thirdparties/publicsuffix.org           $DES/thirdparties/
@@ -27,5 +30,8 @@ cp -R ../uAssets/thirdparties/winhelp2002.mvps.org       $DES/thirdparties/
 cp -R ../uAssets/thirdparties/www.malwaredomainlist.com  $DES/thirdparties/
 mkdir $DES/umatrix
 cp -R ../uAssets/recipes/*                               $DES/umatrix/
+pushd ../uAssets
+git checkout master
+popd
 
 echo "done."