adblock-fast: update to 1.2.2-18

* Switch Hagezi URL to a more compact higher-level only domains list as we
  prefer it anyways and there's less processing (thanks @dave14305)
* When update_config_sizes is unset, save collected sizes to RAM to improve
  luci app performance (thanks @sshaikh)

Signed-off-by: Stan Grishin <redacted>

diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile
index 645980b95463efa0e7c171454c440c681a0daa1c..2b4385d51f9ca52f32846e833488d3a168a4dbc6 100644 (file)
--- a/net/adblock-fast/Makefile
+++ b/net/adblock-fast/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock-fast
 PKG_VERSION:=1.2.2
-PKG_RELEASE:=16
+PKG_RELEASE:=18
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=AGPL-3.0-or-later
 

diff --git a/net/adblock-fast/files/adblock-fast.config.update b/net/adblock-fast/files/adblock-fast.config.update
index 2c53a16cbb8ab6d145bd9a448e0777885bd5d44b..ea5732f85a2b15272d5fa8a6d2dde5f53bd29f63 100644 (file)
--- a/net/adblock-fast/files/adblock-fast.config.update
+++ b/net/adblock-fast/files/adblock-fast.config.update
@@ -13,4 +13,5 @@ s|list blocked_hosts_url 'https://hosts.oisd.nl/'|list blocked_adblockplus_url '
 \|dnsmasq.oisd.nl|d
 \|dnsmasq2.oisd.nl|d
 \|https://cdn.jsdelivr.net/gh/AdguardTeam/cname-trackers@master/combined_disguised_trackers_justdomains.txt|d
+s|https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/domains/pro.txt|https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/wildcard/pro-onlydomains.txt|g
 \|sysctl.org/cameleon/hosts|d

diff --git a/net/adblock-fast/files/etc/config/adblock-fast b/net/adblock-fast/files/etc/config/adblock-fast
index 361d84d962b4300e83a56a4481a464bcab2f9bf9..e82639b0a87f65320a11658f081789ef27dae6c5 100644 (file)
--- a/net/adblock-fast/files/etc/config/adblock-fast
+++ b/net/adblock-fast/files/etc/config/adblock-fast
@@ -41,8 +41,8 @@ config adblock-fast 'config'
 
 config file_url
        option name 'Hagezi - Pro'
-       option url 'https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/domains/pro.txt'
-       option size '12522070'
+       option url 'https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/wildcard/pro-onlydomains.txt'
+       option size '3476485'
        option action 'block'
        option enabled '0'
 

diff --git a/net/adblock-fast/files/lib/adblock-fast/adblock-fast.uc b/net/adblock-fast/files/lib/adblock-fast/adblock-fast.uc
index 008ba57defc414034e07aff958760cf63de39d47..5c4e6779ed81441df319f70ea7ea562993fe7a27 100644 (file)
--- a/net/adblock-fast/files/lib/adblock-fast/adblock-fast.uc
+++ b/net/adblock-fast/files/lib/adblock-fast/adblock-fast.uc
@@ -5,7 +5,7 @@
 // Main ucode module for adblock-fast.
 // All business logic lives here; the init script is a thin procd wrapper.
 
-import { readfile, writefile, popen, stat, unlink, rename, open, glob, mkdir, mkstemp, symlink, chmod, chown, realpath, lsdir, access, dirname } from 'fs';
+import { readfile, writefile, popen, stat, unlink, rename, open, glob, mkdir, symlink, chmod, chown, realpath, lsdir, access, dirname } from 'fs';
 import { cursor } from 'uci';
 import { connect } from 'ubus';
 import * as uloop from 'uloop';
@@ -200,6 +200,17 @@ let dns_output = {
 // Config values loaded by env.load_config()
 let cfg = {};
 
+// RAM mirror of UCI config for sizes (used when update_config_sizes is false)
+function ram_uci(name) {
+       let confdir = '/var/run/' + name + '/uci';
+       let mirror = confdir + '/' + name;
+       if (!stat(mirror)) {
+               system('mkdir -p ' + confdir);
+               writefile(mirror, readfile('/etc/config/' + name) || '');
+       }
+       return cursor(confdir);
+}
+
 // ── Shell / System Helpers ──────────────────────────────────────────
 
 function shell_quote(s) {
@@ -1609,12 +1620,14 @@ function process_file_url(section, url_override, action_override, predownloaded)
                // Ensure newline at end
                ensure_trailing_newline(r_tmp);
 
-               // Update size in config if changed
+               // Update size in config or RAM mirror
                if (section) {
                        let new_size = get_local_filesize(r_tmp);
-                       if (new_size != null && ('' + size_val) != ('' + new_size))
-                               uci(pkg.name).set(pkg.name, section, 'size', '' + new_size);
-                       uci(pkg.name).save(pkg.name);
+                       if (new_size != null && ('' + size_val) != ('' + new_size)) {
+                               let c = cfg.update_config_sizes ? uci(pkg.name) : ram_uci(pkg.name);
+                               c.set(pkg.name, section, 'size', '' + new_size);
+                               c.save(pkg.name);
+                       }
                }
 
                let format = detect_file_type(r_tmp);
@@ -1690,9 +1703,10 @@ function download_lists() {
                output.warning(get_text('warningFreeRamCheckFail'));
        } else {
                let total_sizes = 0;
+               let c = cfg.update_config_sizes ? uci(pkg.name) : ram_uci(pkg.name);
                uci(pkg.name).foreach(pkg.name, 'file_url', (s) => {
                        if (s.enabled == '0') return;
-                       let sz = s.size;
+                       let sz = c.get(pkg.name, s['.name'], 'size');
                        if (!sz && s.url) sz = get_url_filesize(s.url);
                        if (sz) total_sizes += int('' + sz);
                });
@@ -1740,26 +1754,29 @@ function download_lists() {
                if (length(jobs) > 0) {
                        uloop.init();
                        let pending = length(jobs);
-                       for (let job in jobs) {
+                       for (let i = 0; i < length(jobs); i++) {
+                               let job = jobs[i];
                                let dl_cmd = sprintf('%s %s %s %s 2>/dev/null',
                                        dlt.command, shell_quote(job.url), dlt.flag, shell_quote(job.r_tmp));
                                uloop.process('/bin/sh', ['-c', dl_cmd], {}, () => {
+                                       process_file_url(job.cfg_name, null, null, job.r_tmp);
                                        if (--pending == 0) uloop.end();
                                });
                        }
                        uloop.run();
                        uloop.done();
-                       for (let job in jobs)
-                               process_file_url(job.cfg_name, null, null, job.r_tmp);
                }
        } else {
                for (let cfg_name in download_cfgs)
                        process_file_url(cfg_name);
        }
 
-       if (uci_has_changes(pkg.name)) {
-               output.verbose('[PROC] Saving updated file sizes ');
-               if (cfg.update_config_sizes && uci(pkg.name).commit(pkg.name))
+       let c = cfg.update_config_sizes ? uci(pkg.name) : ram_uci(pkg.name);
+       if (length(c.changes(pkg.name) || [])) {
+               output.verbose(cfg.update_config_sizes
+                       ? '[PROC] Saving updated file sizes '
+                       : '[PROC] Saving updated file sizes to RAM ');
+               if (c.commit(pkg.name))
                        output.ok();
                else
                        output.fail();
@@ -2734,19 +2751,19 @@ function show_blocklist() {
 
 function sizes() {
        env.load_config();
+       let c = cfg.update_config_sizes ? uci(pkg.name) : ram_uci(pkg.name);
        uci(pkg.name).foreach(pkg.name, 'file_url', (s) => {
                let size = get_url_filesize(s.url);
                output.print((s.name || s.url) + (size ? ': ' + size : '') + ' ');
                if (size) {
-                       uci(pkg.name).set(pkg.name, s['.name'], 'size', '' + size);
+                       c.set(pkg.name, s['.name'], 'size', '' + size);
                        output.okn();
                } else {
                        output.failn();
                }
        });
-       uci(pkg.name).save(pkg.name);
-       if (cfg.update_config_sizes && length(uci(pkg.name).changes(pkg.name) || []))
-               uci(pkg.name).commit(pkg.name);
+       c.save(pkg.name);
+       c.commit(pkg.name);
 }
 
 // ── get_network_trigger_info (for service_triggers) ─────────────────
@@ -2854,9 +2871,17 @@ function get_file_url_filesizes(name) {
        env.load_config();
 
        let files = [];
+       let c = cfg.update_config_sizes ? uci(pkg.name) : ram_uci(pkg.name);
        uci(pkg.name).foreach(pkg.name, 'file_url', (s) => {
-               let size = s.size;
-               if (!size && s.url) size = get_url_filesize(s.url);
+               let size = c.get(pkg.name, s['.name'], 'size');
+               if (!size && s.url) {
+                       size = get_url_filesize(s.url);
+                       if (size) {
+                               c.set(pkg.name, s['.name'], 'size', '' + size);
+                               c.save(pkg.name);
+                               c.commit(pkg.name);
+                       }
+               }
                push(files, { name: s.name || s.url, url: s.url, size: size || '' });
        });
 

diff --git a/net/adblock-fast/tests/lib/mocklib/uci.uc b/net/adblock-fast/tests/lib/mocklib/uci.uc
index 501ca1c92d8b7b092a070c5fb4e956806b0f0c43..155cbef89d5dd00e79b2c06e0a162c4aa8006d75 100644 (file)
--- a/net/adblock-fast/tests/lib/mocklib/uci.uc
+++ b/net/adblock-fast/tests/lib/mocklib/uci.uc
@@ -5,7 +5,7 @@ let mocklib = global.mocklib; // ucode-lsp disable
 
 let byte = (str, off) => { // ucode-lsp disable
        let v = ord(str, off);
-       return length(v) ? v[0] : v;
+       return type(v) == 'array' ? v[0] : v;
 };
 
 let hash = (s) => { // ucode-lsp disable
@@ -99,7 +99,7 @@ return {
                        }
 
                        let cfg = this._configs[config],
-                           extended = match(section, "^@([A-Za-z0-9_-]+)\\[(-?[0-9]+)\\]$");
+                           extended = match('' + section, /^@([A-Za-z0-9_-]+)\[(-?[0-9]+)\]$/);
 
                        if (extended) {
                                let stype = extended[1],
@@ -111,7 +111,7 @@ return {
                                );
 
                                if (sindex < 0)
-                                       sindex = sids.length + sindex;
+                                       sindex = length(sids) + sindex;
 
                                return cfg[sids[sindex]];
                        }

diff --git a/net/adblock-fast/tests/run_tests.sh b/net/adblock-fast/tests/run_tests.sh
index 47e3a78ff2aef672ef1899c04d6f60f6eb4d0978..3037c5ac0d223ea3d406b7a827a34f548d2c3d59 100644 (file)
--- a/net/adblock-fast/tests/run_tests.sh
+++ b/net/adblock-fast/tests/run_tests.sh
@@ -94,6 +94,8 @@ sed \
        -e "s|run_file: '/dev/shm/adblock-fast'|run_file: '${TESTDIR}/shm/adblock-fast'|" \
        -e "s|status_file: '/dev/shm/adblock-fast.status.json'|status_file: '${TESTDIR}/shm/adblock-fast.status.json'|" \
        -e "s|'/var/run/' + pkg.name|'${TESTDIR}/var_run/' + pkg.name|g" \
+       -e "s|'/var/run/' + name|'${TESTDIR}/var_run/' + name|g" \
+       -e "s|'/etc/config/' + name|'${TESTDIR}/etc/' + name|g" \
        -e "s|'/var/lib/unbound/adb_list.' + pkg.name|'${TESTDIR}/var_run/' + pkg.name + '/adb_list.' + pkg.name|g" \
        -e "s|'/var/' + pkg.name|'${TESTDIR}/var/' + pkg.name|g" \
        -e "s|for (let dir in \['/usr/sbin', '/usr/bin', '/sbin', '/bin'\])|for (let dir in ['${stub_dir}', '/usr/sbin', '/usr/bin', '/sbin', '/bin'])|" \