Bump version to v0.9.20260307

src: 9aaa419f68

.github/workflows/build.yml

@@ -116,12 +116,13 @@ jobs:
       - id: set
         run: |
           echo "IPK_BRANCH=v24.10.5" >> "$GITHUB_OUTPUT"
-          echo "APK_BRANCH=v25.12.0-rc2" >> "$GITHUB_OUTPUT"
+          echo "APK_BRANCH=v25.12.0" >> "$GITHUB_OUTPUT"
           echo "XXX_BRANCH=SNAPSHOT" >> "$GITHUB_OUTPUT"
 
   build:
     needs: [ check, var ]
     #if: needs.check.outputs.is_active == 'true'
+    name: "${{ matrix.branch }}: ${{ matrix.arch }}"
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
@@ -155,6 +156,7 @@ jobs:
           - mipsel_24kc_24kf
           - mipsel_74kc
           - mipsel_mips32
+          - riscv64_generic
           - x86_64
         isTestOrFake:
           - ${{ needs.check.outputs.test_build == 'true' || needs.check.outputs.fake_build == 'true' }}
@@ -163,6 +165,8 @@ jobs:
             arch: arm_cortex-a9_vfpv3-d16
           - branch: ${{ needs.var.outputs.APK_BRANCH }}
             arch: mips_4kec
+          - branch: ${{ needs.var.outputs.IPK_BRANCH }}
+            arch: riscv64_generic
           - { isTestOrFake: true }
         include:
           - branch: ${{ needs.var.outputs.IPK_BRANCH }}
@@ -270,6 +274,8 @@ jobs:
         run: |
           make defconfig
           sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
+          sed -i 's/CONFIG_LUCI_CSSTIDY=y/CONFIG_LUCI_CSSTIDY=n/g' .config
+          grep -q '^CONFIG_LUCI_CSSTIDY=' .config || echo 'CONFIG_LUCI_CSSTIDY=n' >> .config
           echo "status=success" >> $GITHUB_OUTPUT
 
       - name: Show config

luci-app-zapret2/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret2
-PKG_VERSION:=0.8.20260118
+PKG_VERSION:=0.9.20260307
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js

@@ -23,9 +23,17 @@ return baseclass.extend({
         this.logArea.scrollTop = this.logArea.scrollHeight;
     },
 
+    setBtnMode: function(check1, check2, cancel)
+    {
+        this.btn_dpicheck.disabled   = check1  ? false : true;
+        this.btn_sitescheck.disabled = check2  ? false : true;
+        this.btn_cancel.disabled     = cancel  ? false : true;
+    },
+
     dpiCheck: async function()
     {
         this._action = 'dpiCheck';
+        this.setBtnMode(0, 0, 0);
         this.appendLog('DPI check [tcp 16-20]...');
         this.appendLog('Original sources: https://github.com/hyperion-cs/dpi-checkers');
         this.appendLog('WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/');
@@ -35,31 +43,54 @@ return baseclass.extend({
         if (dns_ip && dns_ip != 'default') {
             cmd.push(...[ '-d', dns_ip.trim() ]);
         }
-        cmd.push('-R');  // show recommendations
-        let log = '/tmp/'+tools.appName+'_dwc.log';
-        let callback = this.execAndReadCallback;
-        let wnd = this;
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+        //cmd.push('-R');  // show recommendations
+        return tools.execAndRead({
+            cmd: cmd,
+            log: '/tmp/'+tools.appName+'_dwc.log',
+            logArea: this.logArea,
+            callback: this.execAndReadCallback,
+            ctx: this,
+        });
     },
 
-    execAndReadCallback: function(wnd, rc, txt = '')
+    sitesCheck: async function()
     {
+        this._action = 'dpiCheck';
+        this.setBtnMode(0, 0, 0);
+        this.appendLog('Sites check...');
+        let cmd = [ fn_dwc_sh ];
+        let resolve_dns = document.getElementById('cfg_resolve_dns');
+        let dns_ip = resolve_dns.options[resolve_dns.selectedIndex].text;
+        if (dns_ip && dns_ip != 'default') {
+            cmd.push(...[ '-d', dns_ip.trim() ]);
+        }
+        cmd.push('-s');  // mode: check sites
+        return tools.execAndRead({
+            cmd: cmd,
+            log: '/tmp/'+tools.appName+'_dwc.log',
+            logArea: this.logArea,
+            callback: this.execAndReadCallback,
+            ctx: this,
+        });
+    },
+
+    execAndReadCallback: function(rc, txt = '')
+    {
+        this.setBtnMode(1, 1, 1);
         if (rc == 0 && txt) {
-            if (wnd._action == 'dpiCheck') {
-                wnd.appendLog('=========================================================');
-                return;
-            }
+            this.appendLog('=========================================================');
+            return;
         }
         if (rc >= 500) {
             if (txt) {
-                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+                this.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
             } else {
-                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
+                this.appendLog('ERROR: ' + this._action + ': Terminated with error code = ' + rc);
             }
         } else {
-            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
+            this.appendLog('ERROR: Process finished with retcode = ' + rc);
         }
-        wnd.appendLog('=========================================================');
+        this.appendLog('=========================================================');
     },
 
     openDiagnostDialog: function(pkg_arch)
@@ -111,8 +142,15 @@ return baseclass.extend({
             'id': 'btn_dpicheck',
             'name': 'btn_dpicheck',
             'class': btn_style_action,
-        }, _('DPI check [tcp 16-20]'));
-        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
+        }, _('DPI check'));
+        this.btn_dpicheck.onclick = ui.createHandlerFn(this, this.dpiCheck);
+
+        this.btn_sitescheck = E('button', {
+            'id': 'btn_sitescheck',
+            'name': 'btn_sitescheck',
+            'class': btn_style_action,
+        }, _('Sites check'));
+        this.btn_sitescheck.onclick = ui.createHandlerFn(this, this.sitesCheck);
         
         ui.showModal(_('Diagnostics'), [
             E('div', { 'class': 'cbi-section' }, [
@@ -120,11 +158,17 @@ return baseclass.extend({
                 E('br'), E('br'),
                 this.logArea,
             ]),
-            E('div', { 'class': 'right' }, [
-                this.btn_dpicheck,
-                ' ',
-                this.btn_cancel,
-            ])
+            E('div', { 'style': 'display:flex; justify-content:space-between; align-items:center; margin-top:1px;' }, [
+                E('div', { 'class': 'left' }, [
+                    this.btn_sitescheck,
+                    ' ',
+                    this.btn_dpicheck,
+                ]),
+                E('div', { 'class': 'right' }, [
+                    ' ',
+                    this.btn_cancel,
+                ]),
+            ]),
         ]);
     }    
 });

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/dmnlog.js

@@ -8,15 +8,17 @@
 'require view.zapret2.tools as tools';
 
 return view.extend({
-    retrieveLog: async function() {
-        return Promise.all([
-            L.resolveDefault(fs.stat('/bin/cat'), null),
-            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', tools.appName+'+*.log' ]),
-            uci.load(tools.appName),
-        ]).then(function(status_array) {
-            var filereader = status_array[0] ? status_array[0].path : null;
-            var log_data   = status_array[1];   // stdout: multiline text
-            if (log_data.code != 0) {
+    POLL: new tools.POLLER( { } ),
+    
+    retrieveLog: async function()
+    {
+        return tools.promiseAllDict({
+            filereader   : L.resolveDefault(fs.stat('/bin/cat'), null),
+            log_data     : fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', tools.appName+'+*.log' ]),
+        }).then( (data) => {
+            var filereader = data.filereader ? data.filereader.path : null;
+            var log_data   = data.log_data;   // stdout: multiline text
+            if (log_data?.code === undefined || log_data.code != 0) {
                 ui.addNotification(null, E('p', _('Unable to get log files') + '(code = ' + log_data.code + ') : retrieveLog()'));
                 return null;
             }
@@ -68,17 +70,20 @@ return view.extend({
                 )));
                 return null;
             });
-        }).catch(function(e) {
+        }).catch( (e) => {
             const [, lineno, colno] = e.stack.match(/(\d+):(\d+)/);
             ui.addNotification(null, E('p', _('Unable to execute or read contents')
                 + ': %s [ lineno: %s | %s | %s | %s ]'.format(
                     e.message, lineno, 'retrieveLog', 'uci.'+tools.appName
             )));
             return null;
+        }).finally( () => {
+            this.POLL.running = false;
         });
     },
 
-    pollLog: async function() {
+    pollLog: async function()
+    {
         let logdate_len = -2;
         let logdata;
         for (let txt_id = 0; txt_id < 10; txt_id++) {
@@ -111,26 +116,28 @@ return view.extend({
         }
     },
 
-    load: async function() {
-        poll.add(this.pollLog.bind(this));
-        return await this.retrieveLog();
+    load: function()
+    {
+        return tools.baseLoad(this, (data) => {
+            tools.load_feat_env();
+            this.svc_info = data.svc_info;
+            return this.retrieveLog();
+        });
     },
     
-    render: function(logdata) {
-        if (!logdata) {
-            return;
-        }
+    render: function(logdata)
+    {
         if (typeof(logdata) === 'string') {
             return E('div', {}, [
                 E('p', {'class': 'cbi-title-field'}, [ logdata ]),
             ]);
         }
-        if (!Array.isArray(logdata)) {
+        if (!logdata || !Array.isArray(logdata)) {
             ui.addNotification(null, E('p', _('Unable to get log files') + ' : render()'));
             return;
         }
         var h2 = E('div', {'class' : 'cbi-title-section'}, [
-            E('h2', {'class': 'cbi-title-field'}, [ tools.AppName + ' - ' + _('Log Viewer') ]),
+            E('h2', {'class': 'cbi-title-field'}, [ ]),
         ]);
 
         var tabs = E('div', {}, E('div'));
@@ -193,8 +200,11 @@ return view.extend({
             tabs.firstElementChild.appendChild(tab);
         }
         ui.tabs.initTabGroup(tabs.firstElementChild.childNodes);
-        //this.pollFn = L.bind(this.handleScanRefresh, this);
-        //poll.add(this.pollFn);
+
+        this.POLL.mode = 1;
+        this.POLL.init( this.pollLog.bind(this), 1000 );  // interval 1000 ms
+        this.POLL.start();
+
         return E('div', { }, [ h2, tabs ]);
     },
 

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/env.js

@@ -31,22 +31,39 @@ return baseclass.extend({
     autoHostListFN    : '/opt/zapret2/ipset/zapret-hosts-auto.txt',
     autoHostListDbgFN : '/opt/zapret2/ipset/zapret-hosts-auto-debug.log',
 
-    load_env: function(dst_obj) {
+    load_env: function(ctx)
+    {
         let env_proto = Object.getPrototypeOf(this);
         Object.getOwnPropertyNames(env_proto).forEach(function(key) {
-            if (key === 'constructor' || key === 'load_env' || key.startsWith('__'))
+            if (key === 'constructor' || key.startsWith('__')) {
                 return;
-            dst_obj[key] = env_proto[key];
+            }
+            if (key === 'load_env' || key === 'load_feat_env') {
+                return;
+            }
+            ctx[key] = env_proto[key];
         });
-        dst_obj.packager = { };
-        if (L.hasSystemFeature('apk')) {
-            dst_obj.packager.name = 'apk';
-            dst_obj.packager.path = '/usr/bin/apk';
-            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
-        } else {
-            dst_obj.packager.name = 'opkg';
-            dst_obj.packager.path = '/bin/opkg';
-            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
+        ctx.skey_pkg_dict = this.appName + '-pkg-dict';
+        ctx.skey_deffered_action = this.appName + '-deffered-action';
+        try {
+            L.hasSystemFeature('opkg');
+            this.load_feat_env(ctx);
+        } catch(e) {
+            // nothing
         }
-    }
+    },
+    
+    load_feat_env: function(ctx)
+    {
+        ctx.packager = { };
+        if (L.hasSystemFeature('apk')) {
+            ctx.packager.name = 'apk';
+            ctx.packager.path = '/usr/bin/apk';
+            ctx.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
+        } else {
+            ctx.packager.name = 'opkg';
+            ctx.packager.path = '/bin/opkg';
+            ctx.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
+        }
+    },
 });

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/service.js

@@ -16,16 +16,18 @@ const btn_style_warning  = 'btn cbi-button-negative';
 const btn_style_success  = 'btn cbi-button-success important';
 
 return view.extend({
+    POLL: new tools.POLLER( { } ),
+    
     get_svc_buttons: function(elems = { }) {
         return {
-            enable  : elems.btn_enable  || document.getElementById('btn_enable'),
-            disable : elems.btn_disable || document.getElementById('btn_disable'),
-            start   : elems.btn_start   || document.getElementById('btn_start'),
-            restart : elems.btn_restart || document.getElementById('btn_restart'),
-            stop    : elems.btn_stop    || document.getElementById('btn_stop'),
-            reset   : elems.btn_reset   || document.getElementById('btn_reset'),
-            diag    : elems.btn_diag    || document.getElementById('btn_diag'),
-            update  : elems.btn_update  || document.getElementById('btn_update'),
+            "enable"  : elems.btn_enable  || document.getElementById('btn_enable'),
+            "disable" : elems.btn_disable || document.getElementById('btn_disable'),
+            "start"   : elems.btn_start   || document.getElementById('btn_start'),
+            "restart" : elems.btn_restart || document.getElementById('btn_restart'),
+            "stop"    : elems.btn_stop    || document.getElementById('btn_stop'),
+            "reset"   : elems.btn_reset   || document.getElementById('btn_reset'),
+            "diag"    : elems.btn_diag    || document.getElementById('btn_diag'),
+            "update"  : elems.btn_update  || document.getElementById('btn_update'),
         };
     },
     
@@ -44,17 +46,18 @@ return view.extend({
         btn.update.disabled  = (error_code == 0) ? flag : false;
     },
 
-    getAppStatus: function() {
-        return Promise.all([
-            tools.getInitState(tools.appName),      // svc_boot
-            fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
-            tools.getSvcInfo(),                     // svc_info
-            fs.exec('/bin/busybox', [ 'ps' ]),      // process list
-            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
-            tools.getStratList(),                   // nfqws strategy list
-            fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),  // CPU arch
-            uci.load(tools.appName),              // config
-        ]).catch(e => {
+    getAppStatus: function()
+    {
+        return tools.promiseAllDict({
+            svc_boot   : tools.getInitState(tools.appName),
+            svc_en     : fs.exec(tools.execPath, [ 'enabled' ]),
+            svc_info   : tools.getSvcInfo(),
+            proc_list  : fs.exec('/bin/busybox', [ 'ps' ]),
+            pkg_dict   : tools.getPackageDict(),
+            strat_list : tools.getStratList(),
+            sys_info   : fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),
+            uci_data   : uci.load(tools.appName),
+        }).catch(e => {
             ui.addNotification(null, E('p', _('Unable to execute or read contents')
                 + ': %s [ %s | %s | %s ]'.format(
                     e.message, tools.execPath, 'tools.getInitState', 'uci.'+tools.appName
@@ -62,41 +65,35 @@ return view.extend({
         });
     },
 
-    setAppStatus: function(status_array, elems = { }, force_app_status = 0) {
+    setAppStatus: function(data, elems = { }, force_app_status = 0)
+    {
+        tools.execDefferedAction();
         let cfg = uci.get(tools.appName, 'config');
-        if (!status_array || cfg == null || typeof(cfg) !== 'object') {
+        if (!data || cfg == null || typeof(cfg) !== 'object') {
             let elem_status = elems.status || document.getElementById("status");
             elem_status.innerHTML = tools.makeStatusString(null, '', '');
             ui.addNotification(null, E('p', _('Unable to read the contents') + ': setAppStatus()'));
             this.disableButtons(true, -1, elems);
             return;
         }
-        let svc_boot  = status_array[0] ? true : false;
-        let svc_en    = status_array[1];   // stdout: empty or error text
-        let svc_info  = status_array[2];   // stdout: JSON as text
-        let proc_list = status_array[3];   // stdout: multiline text
-        let pkg_list  = status_array[4];   // stdout: installed packages
-        let stratlist = status_array[5];   // array of strat names
-        let sys_info  = status_array[6];   // stdout: openwrt distrib info
+        let svc_boot  = data.svc_boot ? true : false;
+        this.nfqws_strat_list = data.strat_list;
+        this.pkg_arch = tools.getConfigPar(data.sys_info.stdout, 'DISTRIB_ARCH', 'unknown');
+        //console.log('svc_en: ' + data.svc_en.code + '  poll.running = ' + this.POLL.running);
+        let svc_en = (data.svc_en.code == 0) ? true : false;
         
-        this.nfqws_strat_list = stratlist;
-        this.pkg_arch = tools.getConfigPar(sys_info.stdout, 'DISTRIB_ARCH', 'unknown');
-        
-        //console.log('svc_en: ' + svc_en.code);
-        svc_en = (svc_en.code == 0) ? true : false;
-        
-        if (typeof(svc_info) !== 'object') {
+        if (typeof(data.svc_info) !== 'object') {
             ui.addNotification(null, E('p', _('Unable to read the service info') + ': setAppStatus()'));
             this.disableButtons(true, -1, elems);
             return;
         }
-        if (proc_list.code != 0) {
+        if (data.proc_list.code != 0) {
             ui.addNotification(null, E('p', _('Unable to read process list') + ': setAppStatus()'));
             this.disableButtons(true, -1, elems);
             return;
         }
-        if (pkg_list.code != 0) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+        if (!data.pkg_dict) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': getPackageDict()'));
             this.disableButtons(true, -1, elems);
             return;
         }
@@ -104,7 +101,7 @@ return view.extend({
         if (force_app_status) {
             svcinfo = force_app_status;
         } else {
-            svcinfo = tools.decode_svc_info(svc_en, svc_info, proc_list, cfg);
+            svcinfo = tools.decode_svc_info(svc_en, data.svc_info, data.proc_list, cfg);
         }
         let btn = this.get_svc_buttons(elems);
         btn.reset.disabled = false;
@@ -129,104 +126,70 @@ return view.extend({
         }
         let elem_status = elems.status || document.getElementById("status");
         elem_status.innerHTML = tools.makeStatusString(svcinfo, this.pkg_arch, '');
-        
-        if (!poll.active()) {
-            poll.start();
-        }
+        this.POLL.running = false;
     },
 
-    serviceAction: function(action, button) {
-        if (button) {
-            let elem = document.getElementById(button);
-            this.disableButtons(true, elem);
+    serviceActionEx: async function(action, button, args = [ ], hide_modal = false)
+    {
+        let btn = document.getElementById(button);
+        if (btn?.create_args) {
+            args = btn.create_args();
+            console.log('serviceActionEx: btn.args = '+JSON.stringify(args));
         }
-        poll.stop();
-        
-        let _this = this;
-        
-        return tools.handleServiceAction(tools.appName, action)
-        .then(() => {
-            return _this.getAppStatus().then(
-                (status_array) => {
-                    _this.setAppStatus(status_array);
+        if (action == 'reset') {
+            hide_modal = true;
+        }
+        await this.POLL.stopAndWait();
+        this.disableButtons(true, btn);
+        //console.log('serviceActionEx: poll.running = '+this.POLL.running);
+        try {
+            if (action == 'start' || action == 'restart') {
+                let apply_exec = tools.checkUnsavedChanges();
+                if (apply_exec) {
+                    ui.changes.apply(true);  // apply_rollback
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                    tools.setDefferedAction(action, null, true);
+                    return;
                 }
-            );
-        })
-        .catch(e => { 
-            ui.addNotification(null, E('p', _('Unable to run service action.') + ' Error: ' + e.message));
-        });
-    },
-
-    serviceActionEx: function(action, button, args = [ ], hide_modal = false) {
-        if (button) {
-            let elem = document.getElementById(button);
-            this.disableButtons(true, elem);
-        }
-        poll.stop();
-        
-        let _this = this;
-        let exec_cmd = null;
-        let exec_arg = [ ];
-        let errmsg = 'ERROR:';
-        if (action == 'start' || action == 'restart') {
-            exec_cmd = tools.syncCfgPath;
-            errmsg = _('Unable to run sync_config.sh script.');
-        }
-        else if (action == 'reset') {
-            exec_cmd = tools.defaultCfgPath;
-            exec_arg = args;  // (reset_ipset)(sync) ==> restore all configs + sync config
-            errmsg = _('Unable to run restore-def-cfg.sh script.');
-            action = null;
-        } else {
-            ui.addNotification(null, E('p', 'ERROR: unknown action'));
-            return null;
-        }
-        return fs.exec(exec_cmd, exec_arg)
-        .then(function(res) { 
-            if (res.code != 0) {
-                ui.addNotification(null, E('p', errmsg + ' res.code = ' + res.code));
-                action = null;  // return with error
             }
+            await tools.serviceActionEx(action, args, false);
             if (hide_modal) {
                 ui.hideModal();
             }
-            if (!action) {
-                return _this.getAppStatus().then(
-                    (status_array) => {
-                        _this.setAppStatus(status_array);
-                    }
-                );
-            }
-            return _this.serviceAction(action, null);
-        })
-        .catch(e => { 
-            ui.addNotification(null, E('p', errmsg + ' Error: ' + e.message));
-        });
-    },
-
-    appAction: function(action, button) {
-        if (button) {
-            let elem = document.getElementById(button);
-            this.disableButtons(true, elem);
+        } catch(e) { 
+            //ui.addNotification(null, E('p', 'Error: ' + e.message));
         }
-        poll.stop();
-        return fs.exec_direct(tools.execPath, [ action ]).then(res => {
-            return this.getAppStatus().then(
-                (status_array) => {
-                    this.setAppStatus(status_array);
-                    ui.hideModal();
-                }
-            );
-        });
+    },
+    
+    serviceActionExCallback: function(btn, result, error)
+    {
+        //console.log('serviceActionExCallback: poll.active = '+this.POLL.active);
+        this.POLL.start(150);
     },
 
-    statusPoll: function() {
+    createServiceHandlerFn: function(action, btn_name)
+    {
+        let opt = { keepDisabled: true, callback: this.serviceActionExCallback };
+        return tools.createHandlerFnEx(this, 'serviceActionEx', opt, action, btn_name);
+    },
+
+    statusPoll: function()
+    {
+        if (tools.isModalActive()) {
+            this.POLL.running = false;
+            return;  // not update page when any modal dialog is active
+        }
         this.getAppStatus().then(
             L.bind(this.setAppStatus, this)
         );
     },
 
-    dialogResetCfg: function(ev) {
+    dialogResetCfg: function(ev)
+    {
+        if (tools.checkUnsavedChanges()) {
+            ui.addNotification(null, E('p', _('You have unapplied changes')));
+            return;
+        }
         ev.target.blur();
 
         let reset_base = E('label', [
@@ -269,13 +232,15 @@ return view.extend({
         let cancel_button = E('button', {
             'class': btn_style_neutral,
             'click': ui.hideModal,
+            'class': btn_style_warning,
         }, _('Cancel'));
 
         let resetcfg_btn = E('button', {
+            'id': 'resetcfg_btn',
+            'name': 'resetcfg_btn',
             'class': btn_style_action,
         }, _('Reset settings'));
-        resetcfg_btn.onclick = ui.createHandlerFn(this, () => {
-            //cancel_button.disabled = true;
+        resetcfg_btn.create_args = () => {
             let opt_flags = '';
             if (document.getElementById('cfg_reset_base').checked == false) {
                 opt_flags += '(skip_base)';
@@ -292,17 +257,15 @@ return view.extend({
             if (document.getElementById('cfg_enable_custom_d').checked) {
                 opt_flags += '(enable_custom_d)';
             };
-            //console.log('RESET: opt_flags = ' + opt_flags);
             let sel_strat = document.getElementById('cfg_nfqws_strat');
             let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
-            //console.log('RESET: strat = ' + opt_strat);
             if (opt_strat == 'not change') {
                 opt_strat = '-';
             }
             opt_flags += '(sync)';
-            let args = [ opt_flags, opt_strat ];
-            return this.serviceActionEx('reset', resetcfg_btn, args, true);
-        });
+            return [ opt_flags, opt_strat ];
+        };
+        resetcfg_btn.onclick = this.createServiceHandlerFn('reset', 'resetcfg_btn');
 
         ui.showModal(_('Reset settings to default'), [
             E('div', { 'class': 'cbi-section' }, [
@@ -319,32 +282,36 @@ return view.extend({
                 nfqws_strat,
                 E('br'), E('br')
             ]),
-            E('div', { 'class': 'right' }, [
-                cancel_button,
-                ' ',
-                resetcfg_btn,
-            ])
+            E('div', { 'style': 'display:flex; justify-content:space-between; align-items:center; margin-top:1px;' }, [
+                E('div', { 'class': 'left' }, [
+                    resetcfg_btn,
+                ]),
+                E('div', { 'class': 'right' }, [
+                    cancel_button,
+                ]),
+            ]),
         ]);
     },
 
-    load: function() {
-        var _this = this;
-        return Promise.all([
-            L.resolveDefault(fs.stat('/bin/cat'), null),
-        ]).then(function(data) {
-            return _this.getAppStatus();
+    load: function()
+    {
+        return tools.baseLoad(this, (data) => {
+            //console.log('SYS FEATURES: '+JSON.stringify(data.sys_feat));
+            tools.load_feat_env();
+            return this.getAppStatus();
         });
     },
 
-    render: function(status_array) {
-        if (!status_array) {
+    render: function(data)
+    {
+        if (!data) {
             return;
         }
         let cfg = uci.get(tools.appName, 'config');
 
-        let pkg_list = status_array[4];
-        if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+        let pkgdict = data.pkg_dict;
+        if (pkgdict == null) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
             return;
         }
 
@@ -390,17 +357,17 @@ return view.extend({
         };
         
         let btn_enable      = create_btn('btn_enable',  btn_style_success, _('Enable'));
-        btn_enable.onclick  = ui.createHandlerFn(this, this.serviceAction, 'enable', 'btn_enable');
+        btn_enable.onclick  = this.createServiceHandlerFn('enable', 'btn_enable');
         let btn_disable     = create_btn('btn_disable', btn_style_warning, _('Disable'));
-        btn_disable.onclick = ui.createHandlerFn(this, this.serviceAction, 'disable', 'btn_disable');
+        btn_disable.onclick = this.createServiceHandlerFn('disable', 'btn_disable');
         layout_append(_('Service autorun control'), null, [ btn_enable, btn_disable ] );
 
         let btn_start       = create_btn('btn_start',   btn_style_action, _('Start'));
-        btn_start.onclick   = ui.createHandlerFn(this, this.serviceActionEx, 'start', 'btn_start');
+        btn_start.onclick   = this.createServiceHandlerFn('start', 'btn_start');
         let btn_restart     = create_btn('btn_restart', btn_style_action, _('Restart'));
-        btn_restart.onclick = ui.createHandlerFn(this, this.serviceActionEx, 'restart', 'btn_restart');
+        btn_restart.onclick = this.createServiceHandlerFn('restart', 'btn_restart');
         let btn_stop        = create_btn('btn_stop',    btn_style_warning, _('Stop'));
-        btn_stop.onclick    = ui.createHandlerFn(this, this.serviceAction, 'stop', 'btn_stop');
+        btn_stop.onclick    = this.createServiceHandlerFn('stop', 'btn_stop');
         layout_append(_('Service daemons control'), null, [ btn_start, btn_restart, btn_stop ] );
 
         let btn_reset       = create_btn('btn_reset', btn_style_action, _('Reset settings'));
@@ -411,9 +378,9 @@ return view.extend({
         btn_diag.onclick    = ui.createHandlerFn(this, () => { diagnost.openDiagnostDialog(this.pkg_arch) });
         layout_append('Diagnostic tools', null, [ btn_diag ] );
 
-        let btn_update      = create_btn('btn_update',  btn_style_action, _('Update'));
+        let btn_update      = create_btn('btn_update',  btn_style_action, _('Upgrade…'));
         btn_update.onclick  = ui.createHandlerFn(this, () => { updater.openUpdateDialog(this.pkg_arch) });
-        layout_append(_('Update package'), null, [ btn_update ] );
+        layout_append(_('Upgrading the package'), null, [ btn_update ] );
 
         let elems = {
             "status": status_string,
@@ -426,17 +393,19 @@ return view.extend({
             "btn_diag": btn_diag,
             "btn_update": btn_update,
         };
-        this.setAppStatus(status_array, elems);
+        this.setAppStatus(data, elems);
 
-        poll.add(L.bind(this.statusPoll, this));
+        this.POLL.mode = 1;
+        this.POLL.init( L.bind(this.statusPoll, this), 2000 );  // interval 2 sec
+        this.POLL.start(500);  // first step after 500 ms
 
         let page_title = tools.AppName;
-        let pkgdict = tools.decode_pkg_list(pkg_list.stdout, false);
         page_title += ' &nbsp ';
         if (pkgdict[tools.appName] === undefined || pkgdict[tools.appName] == '') {
             page_title += 'unknown version';
         } else {
             page_title += 'v' + pkgdict[tools.appName];
+            page_title = page_title.replace(/-r1$/, '');
         }
         let aux1 = E('em');
         let aux2 = E('em');

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/settings.js

@@ -13,43 +13,24 @@ document.head.appendChild(E('link', {
 }));
 
 return view.extend({
-    parsers: { },
+    svc_info: null,
 
-    appStatusCode: null,
-
-    depends: function(elem, key, array, empty=true) {
-        if (empty && array.length === 0) {
-            elem.depends(key, '_dummy');
-        } else {
-            array.forEach(e => elem.depends(key, e));
-        }
-    },
-
-    validateIpPort: function(section, value) {
-        return (/^$|^([0-9]{1,3}\.){3}[0-9]{1,3}(#[\d]{2,5})?$/.test(value)) ? true : _('Expecting:')
-            + ` ${_('One of the following:')}\n - ${_('valid IP address')}\n - ${_('valid address#port')}\n`;
-    },
-
-    validateUrl: function(section, value) {
-        return (/^$|^https?:\/\/[\w.-]+(:[0-9]{2,5})?[\w\/~.&?+=-]*$/.test(value)) ? true : _('Expecting:')
-            + ` ${_('valid URL')}\n`;
-    },
-
-    load: function() {
-        return Promise.all([
-            { code: -1}, // L.resolveDefault(fs.exec(tools.execPath, [ 'raw-status' ]), 1),
-            null, // L.resolveDefault(fs.list(tools.parsersDir), null),
-            uci.load(tools.appName),
-        ]).catch(e => {
-            ui.addNotification(null, E('p', _('Unable to read the contents') + ': %s '.format(e.message) ));
+    load: function()
+    {
+        return tools.baseLoad(this, (data) => {
+            //console.log('SYS FEATURES: '+JSON.stringify(data.sys_feat));
+            tools.load_feat_env();
+            return data;
         });
     },
 
-    render: function(data) {
+    render: function(data)
+    {
         if (!data) {
             return;
         }
-        this.appStatusCode = data[0].code;
+        this.svc_info = data.svc_info;
+        tools.execDefferedAction(this.svc_info);
 
         let m, s, o, tabname;
 
@@ -109,6 +90,43 @@ return view.extend({
         o.rmempty = false;
         o.default = 0;
 
+        let current_size = uci.get(tools.appName, 'config', 'DAEMON_LOG_SIZE_MAX') || '0';
+        let has_valid_value = false;
+        let size_list = [ 500, 1000, 1500, 2000, 2500, 3000, 4000, 5000, 7000 ];
+        if (current_size && current_size != '0') {
+            try {
+                current_size = parseInt(current_size, 10); 
+                if (!isNaN(current_size) && current_size > 0) {
+                    has_valid_value = true;
+                    if (!size_list.includes(current_size)) {
+                        size_list.push(current_size);
+                        size_list.sort((a, b) => a - b);
+                    }
+                }
+            } catch(e) {
+                has_valid_value = false;
+            }    
+        }
+        o = s.taboption(tabname, form.ListValue, 'DAEMON_LOG_SIZE_MAX', _('DAEMON_LOG_SIZE_MAX'));
+        o.rmempty = false;
+        if (!has_valid_value) {
+            o.value('', '');
+            o.default = '';
+        }
+        for (let idx = 0; idx < size_list.length; idx++) {
+            let fsize = size_list[idx];
+            o.value('' + fsize, fsize + ' KB');
+            if (has_valid_value && fsize === current_size) {
+                o.default = '' + fsize;
+            }
+        }
+        o.validate = function(section_id, value) {
+            if (!value || value === '') {
+                return _('Please select maximum log size');
+            }
+            return true;
+        };
+
         /* NFQWS_OPT_DESYNC tab */
 
         tabname = 'nfqws_params';
@@ -480,12 +498,18 @@ return view.extend({
         return map_promise;
     },
 
-    handleSaveApply: function(ev, mode) {
+    handleSaveApply: function(ev, mode)
+    {
         return this.handleSave(ev).then(() => {
-            ui.changes.apply(mode == '0');
-            //if (this.appStatusCode != 1 && this.appStatusCode != 2) {
-            //    window.setTimeout(() => fs.exec(tools.execPath, [ 'restart' ]), 3000);
-            //}
+            let apply_exec = tools.checkUnsavedChanges();
+            if (apply_exec) {
+                ui.changes.apply(mode == '0');
+                tools.setDefferedAction('restart', this.svc_info);
+            } else {
+                if (this.svc_info?.dmn.inited) {
+                    tools.serviceActionEx('restart');
+                }
+            }
         });
     },
 });

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/styles.css

@@ -3,4 +3,6 @@ textarea, .cbi-value textarea
     white-space: pre;
     overflow-x: auto;
     font-family: monospace;
+    pointer-events: auto !important;
+    user-select: text !important;    
 }

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js

@@ -40,7 +40,12 @@ return baseclass.extend({
         env_tools.load_env(this);
         //console.log('appName: ' + this.appName);
         //console.log('PACKAGER: ' + this.packager.name);
-    }, 
+    },
+
+    load_feat_env: function()
+    {
+        env_tools.load_feat_env(this);
+    },
 
     infoLabelRunning  : '<span class="label-status running">'  + _('Running')  + '</span>',
     infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
@@ -101,6 +106,29 @@ return baseclass.extend({
         });
     },
 
+    getPackageDict: function()
+    {
+        let exec_cmd = this.packager.path;
+        let exec_arg = this.packager.args;
+        return fs.exec(exec_cmd, exec_arg).then(res => {
+            let pdict_json = localStorage.getItem(this.skey_pkg_dict);
+            if (res.code != 0) {
+                console.log(this.appName + ': Unable to enumerate installed packages. code = ' + res.code);
+                if (pdict_json != null) {
+                    return JSON.parse(pdict_json);  // return cached value
+                }
+                return null;
+            }
+            let pdict = this.decode_pkg_list(res.stdout);
+            if (pdict != pdict_json) {
+                localStorage.setItem(this.skey_pkg_dict, JSON.stringify(pdict));  // renew cache
+            }
+            return pdict;
+        }).catch(e => {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages.') + ' Error: %s'.format(e)));
+        });
+    },
+
     getStratList: function() {
         let exec_cmd = '/bin/busybox';
         let exec_arg = [ 'awk', '-F', '"', '/if \\[ "\\$strat" = "/ {print $4}', this.defCfgPath ];
@@ -114,7 +142,9 @@ return baseclass.extend({
         });
     },
 
-    handleServiceAction: function(name, action) {
+    handleServiceAction: function(name, action, throwed = false)
+    {
+        console.log('handleServiceAction: '+name+' '+action);
         return this.callInitAction(name, action).then(success => {
             if (!success) {
                 throw _('Command failed');
@@ -122,9 +152,139 @@ return baseclass.extend({
             return true;
         }).catch(e => {
             ui.addNotification(null, E('p', _('Service action failed "%s %s": %s').format(name, action, e)));
+            if (throwed) {
+                throw e;
+            }
         });
     },
 
+    serviceActionEx: async function(action, args = [ ], throwed = false)
+    {
+        let errmsg = null;
+        try {
+            let exec_cmd = null;
+            let exec_arg = [ ];
+            if (action == 'start' || action == 'restart') {
+                exec_cmd = this.syncCfgPath;
+                errmsg = _('Unable to run sync_config.sh script.');
+            }
+            if (action == 'reset') {
+                exec_cmd = this.defaultCfgPath;
+                exec_arg = args;  // (reset_ipset)(sync) ==> restore all configs + sync config
+                errmsg = _('Unable to run restore-def-cfg.sh script.');
+                action = null;
+            }
+            if (exec_cmd) {
+                let res = await fs.exec(exec_cmd, exec_arg);
+                if (res.code != 0) {
+                    throw Error('res.code = ' + res.code);
+                }
+            }
+            errmsg = null;
+            if (action) {
+                await this.handleServiceAction(this.appName, action, throwed);
+            }
+        } catch(e) { 
+            if (throwed) {
+                throw e;
+            } else {
+                let msg = errmsg ? errmsg : _('Unable to run service action') + ' "' + action + '".';
+                ui.addNotification(null, E('p', msg + ' Error: ' + e.message));
+            }
+        }
+    },
+
+    promiseAllDict: function(promisesDict)
+    {
+        const keys = Object.keys(promisesDict);
+        const promises = keys.map(key => promisesDict[key]);
+        return Promise.all(promises)
+            .then(results => {
+                const resultDict = { };
+                keys.forEach((key, index) => {
+                    resultDict[key] = results[index];
+                });
+                return resultDict;
+            });
+    },    
+    
+    baseLoad: function(ctx, callback)
+    {
+        return Promise.all([
+            L.probeSystemFeatures(),
+            this.getSvcInfo(),           // svc_info
+            uci.load(this.appName),
+        ])
+        .then( ([ sys_feat, svcInfo, uci_data ]) => {
+            let svc_info = this.decodeSvcInfo(svcInfo);
+            let ret = { sys_feat, svc_info, uci_data };
+            if (typeof(callback) === 'function') {
+                const res = callback.call(ctx, ret);
+                if (res && typeof(res.then) === 'function') {
+                    return res.then(() => res);
+                }
+                return ret;
+            }
+            return ret;
+        })
+        .catch(e => {
+            ui.addNotification(null, E('p', _('Unable to read the contents') + ' (baseLoad): %s '.format(e.message) ));
+            return null;
+        });
+    },
+
+    decodeSvcInfo: function(svc_info, svc_autorun = true, proc_list = [ ])
+    {
+        if (svc_info?.autorun !== undefined && svc_info?.dmn !== undefined) {
+            return svc_info;
+        }
+        if (svc_info != null && typeof(svc_info) == 'object') {
+            return this.decode_svc_info(svc_autorun, svc_info, proc_list);
+        }
+        return null;
+    },
+
+    setDefferedAction: function(action, svcInfo = null, forced = false)
+    {
+        let svc_info = this.decodeSvcInfo(svcInfo);
+        if (action == 'start' && svc_info?.dmn.inited) {
+            action = 'restart';
+        }
+        if (action == 'start') {
+            if (!forced && svc_info?.dmn.inited) {
+                action = null;
+            }
+        }
+        if (action == 'restart') {
+            if (!forced && !svc_info?.dmn.inited) {
+                action = null;
+            }
+        }
+        if (action && localStorage.getItem(this.skey_deffered_action) == null) {
+            localStorage.setItem(this.skey_deffered_action, action);
+            console.log('setDefferedAction: '+this.skey_deffered_action+' = '+action);
+        }
+    },
+    
+    execDefferedAction: function(svcInfo = null)
+    {
+        let svc_info = this.decodeSvcInfo(svcInfo);
+        //console.log('execDefferedAction: svc_info = '+JSON.stringify(svc_info));
+        let action = localStorage.getItem(this.skey_deffered_action);
+        if (action) {
+            localStorage.removeItem(this.skey_deffered_action);
+            console.log('execDefferedAction: '+action);
+            this.serviceActionEx(action);
+        }
+    },
+    
+    checkUnsavedChanges: function()
+    {
+        if (!ui.changes) return false;
+        if (!ui.changes.changes) return false;
+        return ui.changes.changes[this.appName] ? true : false;
+    },
+
     normalizeValue: function(v) {
         return (v && typeof(v) === 'string') ? v.trim().replace(/\r?\n/g, '') : v;
     },
@@ -141,7 +301,7 @@ return baseclass.extend({
         return m ? m[2] : defval;        
     },
 
-    decode_pkg_list: function(pkg_list, with_suffix_r1 = true) {
+    decode_pkg_list: function(pkg_list) {
         let pkg_dict = { };
         if (!pkg_list) {
             return pkg_dict;
@@ -180,11 +340,7 @@ return baseclass.extend({
                 }
             }
             if (rev >= 0) {
-                if (rev == 1 && !with_suffix_r1) {
-                    // nothing
-                } else {
-                    ver += '-r' + rev;
-                }
+                ver += '-r' + rev;
             }
             pkg_dict[name] = ver;
         }
@@ -208,7 +364,8 @@ return baseclass.extend({
         return plist;
     },
 
-    decode_svc_info: function(svc_autorun, svc_info, proc_list, cfg) {
+    decode_svc_info: function(svc_autorun, svc_info, proc_list, cfg = null)
+    {
         let result = {
             "autorun": svc_autorun,
             "dmn": {
@@ -219,13 +376,18 @@ return baseclass.extend({
             },
             "status": this.statusDict.error,
         };
-        if (proc_list.code != 0) {
-            return -2;
-        }        
-        let plist = this.get_pid_list(proc_list.stdout);
-        
-        if (plist.length < 4) {
-            return -3;
+        let plist = proc_list;
+        if (proc_list?.code !== undefined) {
+            if (proc_list.code != 0) {
+                return -2;
+            }        
+            plist = this.get_pid_list(proc_list.stdout);
+            if (plist.length < 4) {
+                return -3;
+            }
+        }
+        if (svc_info == null) {
+            return null;
         }
         if (typeof(svc_info) !== 'object') {
             return -4;
@@ -261,7 +423,7 @@ return baseclass.extend({
         let svc_autorun = _('Unknown');
         let svc_daemons = _('Unknown');
         
-        if (typeof(svcinfo) == 'object') {
+        if (typeof(svcinfo) == 'object' && svcinfo?.autorun !== undefined) {
             svc_autorun = (svcinfo.autorun) ? _('Enabled') : _('Disabled');
             if (!svcinfo.dmn.inited) {
                 svc_daemons = _('Stopped');
@@ -538,12 +700,11 @@ return baseclass.extend({
                 if (value != "" && value != "\t") {
                     value = '\n' + value + '\n';
                     if (this.multiline == 2) {
-                        if (value.includes("'") || value.includes('"')) {
+                        if (value.includes('"')) {
                             alert(_('Unable to save the contents') + ':\n' + _('text cannot contain quotes!'));
                             return false;
                         }
                         value = value.replace(/"/g, '');
-                        value = value.replace(/'/g, '');
                     }
                 }
             } else {
@@ -600,7 +761,12 @@ return baseclass.extend({
         },
     }),
 
-    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, cbarg = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    isModalActive: function()
+    {
+        return document.body.classList.contains('modal-overlay-active');
+    },
+
+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ] } = {})
     {
         function appendLog(msg, end = '\n')
         {
@@ -614,37 +780,81 @@ return baseclass.extend({
             }
         }
         let hide_rows = Array.isArray(hiderow) ? hiderow : [ hiderow ];
-        let rpc_opt = { "timeout": rpc_timeout*1000 };
-        if (rpc_root) {
-            rpc_opt.uid = 0;  // run under root
-        }
         const logFile = log;  // file for reading: '/tmp/zapret_pkg_install.log'
         const rcFile = logFile + '.rc';
         try {
-            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
-            appendLog('Output file cleared!');
+            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile ], null);
+            await fs.exec('/bin/busybox', [ 'rm', '-f', rcFile  ], null);
+            //appendLog('Output file cleared!');
         } catch (e) {
-            return callback(cbarg, 500, 'ERROR: Failed to clear output file');
+            return callback.call(ctx, 500, 'ERROR: Failed to clear output file');
         }
+        let execRetCode = -1;
+        let opt_list = [ logFile ];
         try {
-            let opt_list = [ logFile ];
             opt_list.push(...cmd);
-            let res = await fs.exec(this.appDir+'/script-exec.sh', opt_list, null, rpc_opt);
-            if (res.code != 0) {
-                return callback(cbarg, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
-            }
-            appendLog('Process started...');
+            //console.log('script-exec.sh ... '+JSON.stringify(opt_list));
+            fs.exec(this.appDir+'/script-exec.sh', opt_list, null)
+            .then( (res) => {
+                if (execRetCode < 0) {
+                    execRetCode = res.code;
+                    fixLogEnd();
+                    if (res.code == 0) {
+                        appendLog('Process started....');
+                    } else {
+                        if (res.stdout) appendLog(res.stdout);
+                        appendLog('ERROR: process not executed! ret_code = '+res.code);
+                    }
+                }
+            }).catch( (e) => { 
+                console.log('ERROR: execAndRead: process not exec: '+e.message);
+                execRetCode = -100;
+            });
         } catch (e) {
-            return callback(cbarg, 520, 'ERROR: Failed on execute process: ' + e.message);
+            return callback.call(ctx, 520, 'ERROR: Failed on execute process: ' + e.message);
         }
         let lastLen = 0;
-        let retCode = -1;
+        let retCode = -2;  // rc file not found
         return await new Promise(async (resolve, reject) => {
-            async function poll()
+            let ticks = 0;
+            async function epoll()
             {
+                ticks += 1;
                 try {
-                    let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
-                    if (res.stdout && res.stdout.length > lastLen) {
+                    if (retCode < 0) {
+                        let rc = await fs.exec('/bin/cat', [ rcFile ], null);
+                        if (rc.code != 0) {
+                            if (ticks >= 2) {
+                                console.log('ERROR: execAndRead: '+JSON.stringify(opt_list));
+                                fixLogEnd();
+                                resolve(callback.call(ctx, 542, 'ERROR: Failed on read process rc-file: code = ' + rc.code));
+                                return;
+                            }
+                            console.log('WARN: execAndRead: read rc-file res.code = '+rc.code);
+                        }
+                        if (rc.code == 0) {
+                            if (rc.stdout) {
+                                retCode = parseInt(rc.stdout.trim(), 10);
+                            } else {
+                                retCode = -1;  // rc file exists, but empty
+                            }
+                        }
+                        if (retCode <= -2) {
+                            setTimeout(epoll, 500);
+                            return;  // skip first step with error
+                        }
+                    }
+                    let res = await fs.exec('/bin/cat', [ logFile ], null);
+                    if (res.code != 0) {
+                        fixLogEnd();
+                        resolve(callback.call(ctx, 546, 'ERROR: Failed on read process log: code = ' + res.code));
+                        return;
+                    }
+                    if (execRetCode < 0) {
+                        execRetCode = 9999;
+                        appendLog('Process started...');
+                    }
+                    if (res.code == 0 && res.stdout && res.stdout.length > lastLen) {
                         let log = res.stdout.slice(lastLen);
                         hide_rows.forEach(re => {
                             log = log.replace(re, '');
@@ -652,27 +862,16 @@ return baseclass.extend({
                         appendLog(log, '');
                         lastLen = res.stdout.length;
                     }
-                    if (retCode < 0) {
-                        let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
-                        if (rc.code != 0) {
-                            fixLogEnd();
-                            resolve(callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"'));
-                            return;
-                        }
-                        if (rc.stdout) {
-                            retCode = parseInt(rc.stdout.trim(), 10);
-                        }
-                    }
                     if (retCode >= 0) {
                         fixLogEnd();
                         if (retCode == 0 && res.stdout) {
-                            resolve(callback(cbarg, 0, res.stdout));
+                            resolve(callback.call(ctx, 0, res.stdout));
                             return;
                         }
-                        resolve(callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode));
+                        resolve(callback.call(ctx, retCode, 'ERROR: Process failed with error ' + retCode));
                         return;
                     }
-                    setTimeout(poll, 500);
+                    setTimeout(epoll, 500);
                 } catch (e) {
                     let skip_err = false;
                     if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
@@ -683,18 +882,152 @@ return baseclass.extend({
                     }
                     if (skip_err) {
                         console.warn('WARN: execAndRead: ' + e.message);
-                        setTimeout(poll, 500);
-                        return;  // goto next poll iteration
+                        setTimeout(epoll, 500);
+                        return;  // goto next epoll iteration
                     }
                     fixLogEnd();
                     let errtxt = 'ERROR: execAndRead: ' + e.message;
                     errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
-                    callback(cbarg, 540, errtxt);
+                    callback.call(ctx, 540, errtxt);
                     reject(e);
                 }
             }
-            poll();
+            epoll();
         });
     },
 
+    POLLER: baseclass.extend({
+        __init__: function(opts = { })
+        {
+            Object.assign(this, {
+                interval: 1000, // milliseconds
+                func: null,
+                active: false,
+                running: false,
+            }, opts);
+            env_tools.load_env(this);
+            this.ticks = 0;
+            this.timer = null;
+            this.mode = 0;
+        },
+
+        init: function(func, interval = null)
+        {
+            this.func = func;
+            if (interval) {
+                this.interval = interval;
+            }
+        },
+
+        start: function(delay = 0)
+        {
+            if (this.active) {
+                return;
+            }
+            this.ticks = 0;
+            this.active = true;
+            if (delay === null) {
+                this.step();
+                delay = this.interval;
+            }
+            this.timer = window.setTimeout(this.step.bind(this), delay);
+            return true;
+        },
+
+        stop: function()
+        {
+            this.active = false;
+            if (this.timer) {
+                window.clearTimeout(this.timer);
+                this.timer = null;
+            }
+        },
+        
+        step: function()
+        {
+            if (!this.active) {
+                return;
+            }
+            if (this.timer) {
+                window.clearTimeout(this.timer);
+            }
+            if (this.mode == 1 && this.running) {
+                this.timer = window.setTimeout(this.step.bind(this), 100);
+                return;
+            }
+            this.ticks += 1;
+            this.running = true;
+            Promise.resolve(this.func()).finally((function() { 
+                if (this.mode == 0) {
+                    this.running = false;
+                }
+                this.timer = null;
+                if (this.active) {
+                    this.timer = window.setTimeout(this.step.bind(this), this.interval);
+                }
+            }).bind(this));
+        },
+
+        stopAndWait: async function(interval = 50)
+        {
+            this.stop();
+            if (!this.running) {
+                return;
+            }
+            return new Promise((resolve) => {
+                if (!this.running) {
+                    return resolve();
+                }
+                const timer = setInterval(() => {
+                    if (!this.running) {
+                        resolve();
+                    }
+                }, interval);
+            });
+        },
+    }),
+
+    // original code: https://github.com/openwrt/luci/blob/95319793a27a3554be06070db8c6db71c6e28df1/modules/luci-base/htdocs/luci-static/resources/ui.js#L5342
+    createHandlerFnEx: function(ctx, fn, opts = { }, ...args)
+    {
+        if (typeof(fn) === 'string') {
+            fn = ctx[fn];
+        }
+        if (typeof(fn) !== 'function') {
+            return null;
+        }
+        const {
+            callback = null,   // callback(btn, result, error)
+            keepDisabled = false,
+            noSpin = false
+        } = opts;
+        return L.bind(function() {
+            const btn = arguments[args.length].currentTarget;
+            if (!noSpin) {
+                btn.classList.add('spinning');
+            }
+            btn.disabled = true;
+            if (btn.blur) btn.blur();
+            let result, error;
+            return Promise
+                .resolve()
+                .then(() => fn.apply(ctx, arguments))
+                .then(r => { result = r; })
+                .catch(e => { error = e; })
+                .finally(() => {
+                    if (!noSpin) {
+                        btn.classList.remove('spinning');
+                    }
+                    if (!keepDisabled) {
+                        btn.disabled = false;
+                    }
+                    if (typeof(callback) === 'function') {
+                        callback.call(ctx, btn, result, error);
+                    }
+                    if (error) {
+                        throw error;
+                    }
+                });
+        }, ctx, ...args);
+    },
 });

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js

@@ -59,7 +59,7 @@ return baseclass.extend({
             log: '/tmp/'+tools.appName+'_pkg_check.log',
             logArea: this.logArea,
             callback: this.execAndReadCallback,
-            cbarg: this,  // wnd
+            ctx: this,
         });
     },
 
@@ -84,56 +84,62 @@ return baseclass.extend({
             logArea: this.logArea,
             hiderow: /^ \* resolve_conffiles.*(?:\r?\n|$)/gm,
             callback: this.execAndReadCallback,
-            cbarg: this,  // wnd
+            ctx: this,
         });
     },
 
-    execAndReadCallback: function(wnd, rc, txt = '')
+    execAndReadCallback: function(rc, txt = '')
     {
-        //console.log('execAndReadCallback = ' + rc + '; _action = ' + wnd._action);
+        //console.log('execAndReadCallback = ' + rc + '; _action = ' + this._action);
         if (rc == 0 && txt) {
             let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-            if (wnd._action == 'checkUpdates') {
-                wnd.appendLog('=========================================================');
+            if (this._action == 'checkUpdates') {
+                this.appendLog('=========================================================');
                 if (code && code[1] == 'E') {
-                    wnd.btn_install.textContent = _('Reinstall');
+                    this.btn_install.textContent = _('Reinstall');
                 } else {
-                    wnd.btn_install.textContent = _('Install');
+                    this.btn_install.textContent = _('Install');
                 }
                 let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
                 if (code && pkg_url) {
-                    if (code[1] == 'E' && !wnd.forced_reinstall) {
-                        wnd.setStage(0);  // install not needed
-                        return;
+                    if (!this.forced_reinstall) {
+                        if (code[1] == 'E' || code[1] == 'G') {
+                            this.setStage(0);  // install not needed
+                            return;
+                        }
                     }
-                    wnd.pkg_url = pkg_url[1];
-                    wnd.setStage(2);  // enable all buttons
+                    this.pkg_url = pkg_url[1];
+                    this.setStage(2);  // enable all buttons
                     return;  // install allowed
                 }
             }
-            if (wnd._action == 'installUpdates') {
-                if (wnd._test || (code && code[1] == '+')) {
-                    wnd.setStage(9);
-                    wnd.appendLog('Please update WEB-page (press F5)');
+            if (this._action == 'installUpdates') {
+                if (this._test || (code && code[1] == '+')) {
+                    this.setStage(9);
+                    this.appendLog('Please update WEB-page (press F5)');
                     return;
                 }
             }
         }
-        wnd.setStage(0);
+        this.setStage(0);
         if (rc >= 500) {
             if (txt) {
-                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+                this.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
             } else {
-                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
+                this.appendLog('ERROR: ' + this._action + ': Terminated with error code = ' + rc);
             }
         } else {
-            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
+            this.appendLog('ERROR: Process finished with retcode = ' + rc);
         }
-        wnd.appendLog('=========================================================');
+        this.appendLog('=========================================================');
     },
 
     openUpdateDialog: function(pkg_arch)
     {
+        if (tools.checkUnsavedChanges()) {
+            ui.addNotification(null, E('p', _('You have unapplied changes')));
+            return;
+        }
         this.stage = 0;
         this.pkg_arch = pkg_arch;
         this.pkg_url = null;
@@ -186,7 +192,7 @@ return baseclass.extend({
         
         this.setStage(0);
 
-        ui.showModal(_('Check for updates and install'), [
+        ui.showModal(_('Check for upgrades and installation'), [
             E('div', { 'class': 'cbi-section' }, [
                 exclude_prereleases,
                 E('br'), E('br'),
@@ -195,13 +201,17 @@ return baseclass.extend({
                 E('hr'),
                 this.logArea,
             ]),
-            E('div', { 'class': 'right' }, [
-                this.btn_check,
-                ' ',
-                this.btn_install,
-                ' ',
-                this.btn_cancel,
-            ])
+            E('div', { 'style': 'display:flex; justify-content:space-between; align-items:center; margin-top:1px;' }, [
+                E('div', { 'class': 'left' }, [
+                    this.btn_check,
+                    ' ',
+                    this.btn_install,
+                ]),
+                E('div', { 'class': 'right' }, [
+                    ' ',
+                    this.btn_cancel,
+                ]),
+            ]),
         ]);
-    }    
+    },
 });

zapret2/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2
-PKG_VERSION:=0.8.20260118
+PKG_VERSION:=0.9.20260307
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -14,29 +14,60 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8e67260a23deeaa14b9de325bb911e5594b2d225
-PKG_SOURCE_DATE:=2026-01-18
+PKG_SOURCE_VERSION:=d3b3011000f103c5af161cc4e3167e80fd6928a2
+PKG_SOURCE_DATE:=2026-03-07
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
 #PKG_HASH:=skip
 
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
 LUA_JIT?=1
 
 ifeq ($(LUA_JIT),1)
-	LUAJIT_VER?=2.1
 	LUA_VER?=5.1
-	LUA_DEPEND:=luajit
-	LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/luajit-$(LUAJIT_VER)
-	LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -lluajit-$(LUA_VER)
+	LUA_DEPEND:=
+	LUAJIT_VER?=2.1
+	ifeq ($(ARCH),riscv64)
+		LUAJIT_URL:=https://github.com/infiWang/luajit2/archive
+		LAUJIT_BRANCH:=v2.1-20260114-riscv64
+		LUAJIT_COMMIT=4d8cf882a3a4ed3259407ad78614a60b02dd553f
+		LUAJIT_RELEASE:=2.1-20260114-$(LUAJIT_COMMIT)
+		LUAJIT_URL_FILE:=$(LUAJIT_COMMIT).tar.gz
+	else
+		LUAJIT_URL:=https://github.com/openresty/luajit2/archive/refs/tags
+		LUAJIT_RELEASE:=2.1-20250826
+		LUAJIT_URL_FILE:=v$(LUAJIT_RELEASE).tar.gz
+	endif
+	LUAJIT_TGZ:=$(PKG_NAME)-luajit-$(LUAJIT_RELEASE).tar.gz
+	LUASRC_DIR:=$(PKG_BUILD_DIR)/luajit-$(LUAJIT_RELEASE)
+	LUAOUT_DIR:=$(PKG_BUILD_DIR)/luajit-out
+	LUA_INCLUDE:=-I$(LUAOUT_DIR)/include/luajit-$(LUAJIT_VER)
+	LUA_LIBRARY:=-L$(LUAOUT_DIR)/lib -lluajit-$(LUA_VER)
 else
-	LUA_VER?=5.3
-	LUA_DEPEND:=lua$(LUA_VER)
+	LUA_VER?=5.4
+	LUA_DEPEND:= +lua$(LUA_VER)
 	LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/lua$(LUA_VER)
 	LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -llua$(LUA_VER)
 endif
 
-include $(INCLUDE_DIR)/package.mk
+UPX_VER:=4.2.4
+ifneq ($(filter riscv64,$(ARCH)),)
+  UPX_VER:=5.1.0
+endif
+UPX_URL:=https://github.com/upx/upx/releases/download/v$(UPX_VER)
+UPX_URL_FILE:=upx-$(UPX_VER)-amd64_linux.tar.xz
+UPX_TAR:=$(PKG_NAME)-$(UPX_URL_FILE)
+UPX_DIR:=$(PKG_BUILD_DIR)/upx
+UPX_BIN:=$(UPX_DIR)/upx
+
+ifneq ($(filter mips64,$(ARCH)),)
+  USE_UPX := 0
+else
+  USE_UPX := 1
+endif
 
 #TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
 #TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
@@ -49,26 +80,107 @@ define Package/$(PKG_NAME)
 	TITLE:=$(PKG_NAME)
 	SUBMENU:=Zapret2
 	URL:=https://github.com/bol-van/zapret2
-	DEPENDS:= +nftables +curl +gzip +$(LUA_DEPEND)
+	DEPENDS:= +nftables +curl +gzip $(LUA_DEPEND)
 	DEPENDS+= +coreutils +coreutils-sort +coreutils-sleep
 	DEPENDS+= +kmod-nft-nat +kmod-nft-offload +kmod-nft-queue
-	DEPENDS+= +libnetfilter-queue +libcap +zlib
+	DEPENDS+= +libnetfilter-queue +libmnl +libcap +zlib
 endef
 
+ifeq ($(LUA_JIT),1)
+define Download/$(PKG_NAME)-luajit
+	FILE:=$(LUAJIT_TGZ)
+	URL:=$(LUAJIT_URL)
+	URL_FILE:=$(LUAJIT_URL_FILE)
+	HASH:=skip
+endef
+$(eval $(call Download,$(PKG_NAME)-luajit))
+endif
+
+define Download/$(PKG_NAME)-upx
+	FILE:=$(UPX_TAR)
+	URL:=$(UPX_URL)
+	URL_FILE:=$(UPX_URL_FILE)
+	HASH:=skip
+endef
+$(eval $(call Download,$(PKG_NAME)-upx))
+
 define Build/Prepare
 	$(Build/Prepare/Default)
 	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2
 	rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
 	rm -f $(PKG_BUILD_DIR)/mdig/mdig
+	if [ "$(LUA_JIT)" = 1 ]; then \
+		if [ ! -f "$(DL_DIR)/$(LUAJIT_TGZ)" ]; then \
+			echo "ERROR: LuaJIT tarball not found:"; \
+			echo "  $(LUAJIT_TGZ)"; \
+			echo "Run: make package/$(PKG_NAME)/download"; \
+			false; \
+		fi ; \
+		rm -rf $(LUASRC_DIR) ; \
+		mkdir -p $(LUASRC_DIR) ; \
+		tar -xzf "$(DL_DIR)/$(LUAJIT_TGZ)" --strip-components=1 -C "$(LUASRC_DIR)" ; \
+		rm -rf $(LUAOUT_DIR) ; \
+	fi
+	rm -rf $(UPX_DIR)
+	mkdir -p $(UPX_DIR)
+	tar -xf "$(DL_DIR)/$(UPX_TAR)" --strip-components=1 -C "$(UPX_DIR)"
 endef
 
 #define Build/Configure
 #endef
 
+ifeq ($(HOST_ARCH),$(filter $(HOST_ARCH), x86_64 mips64))
+  ifeq ($(CONFIG_ARCH_64BIT),)
+    HOST_BITS := -m32
+  endif
+endif
+
+MAKE_FLAGS += \
+	$(TARGET_CONFIGURE_OPTS) \
+	SOURCE_DATE_EPOCH=$(shell date +%s) \
+	CFLAGS="$(TARGET_CFLAGS) -DZAPRET_GH_VER=$(PKG_VERSION) -DZAPRET_GH_HASH=$(PKG_SOURCE_VERSION)" \
+	LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"
+
+RSTRIP:=:
+
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS) LUA_JIT=$(LUA_JIT) LUA_CFLAGS="$(LUA_INCLUDE)" LUA_LIB="$(LUA_LIBRARY)"
-	$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(TARGET_CONFIGURE_OPTS)
-	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
+	if [ "$(LUA_JIT)" = 1 ]; then \
+		$(MAKE) $(PKG_JOBS) -C $(LUASRC_DIR) \
+			HOST_CC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_BITS)" \
+			CROSS="$(TARGET_CROSS)" \
+			XCFLAGS="-DLUAJIT_DISABLE_FFI" \
+			TARGET_CFLAGS="-Oz -flto=auto -ffunction-sections -fdata-sections $(TARGET_CFLAGS)" \
+			TARGET_LDFLAGS="-flto=auto $(TARGET_LDFLAGS)" \
+			TARGET_AR="$(TARGET_AR) rcus" \
+			BUILDMODE=static \
+			DESTDIR=$(LUAOUT_DIR) \
+			PREFIX= \
+			TARGET_SYS=Linux ; \
+		rm -rf $(LUAOUT_DIR) ; \
+		if [ ! -f $(LUASRC_DIR)/src/libluajit.a ]; then \
+			echo "ERROR: file libluajit.a not found!"; \
+			false; \
+		fi ; \
+		mkdir -p $(LUAOUT_DIR) ; \
+		$(MAKE) -C $(LUASRC_DIR) \
+			DESTDIR=$(LUAOUT_DIR) \
+			PREFIX= \
+			TARGET_SYS=Linux \
+			install ; \
+	fi
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE_FLAGS) LUA_JIT=$(LUA_JIT) LUA_CFLAGS="$(LUA_INCLUDE)" LUA_LIB="$(LUA_LIBRARY)"
+	$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(MAKE_FLAGS)
+	$(MAKE) -C $(PKG_BUILD_DIR)/mdig   $(MAKE_FLAGS)
+ifeq ($(USE_UPX),1)
+	@if [ -x "$(UPX_BIN)" ]; then \
+		echo "Packing nfqws2 with UPX"; \
+		$(UPX_BIN) --best --lzma --strip-relocs=0 $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2; \
+	else \
+		echo "WARNING: UPX not found, skipping packing"; \
+	fi
+else
+	@echo "Skipping UPX for $(ARCH)"
+endif
 endef
 
 ZAPRET_DIR := /opt/zapret2
@@ -197,7 +309,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
-	if $${PKG_CHECK} zapret2 >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret2 2>/dev/null | grep -q . ; then
 		if [ ! -f "/opt/zapret2/sync_config.sh" ]; then
 			echo "Please uninstall incompatible \"zapret2\" package!"
 			exit 47
@@ -207,7 +319,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			exit 48
 		fi
 	fi
-	if $${PKG_CHECK} luci-app-zapret2 >/dev/null 2>&1; then
+	if $${PKG_CHECK} luci-app-zapret2 2>/dev/null | grep -q . ; then
 		SVC_FILE=/www/luci-static/resources/view/zapret2/service.js
 		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
 			echo "Please uninstall incompatible \"luci-app-zapret2\" package!"
@@ -223,10 +335,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
 		echo "All files of the previously installed package have been removed!"
 	fi
-	if $${PKG_CHECK} zapret2-mdig >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret2-mdig 2>/dev/null | grep -q . ; then
 		$${PKG_REMOVE} zapret2-mdig
 	fi
-	if $${PKG_CHECK} zapret2-ip2net >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret2-ip2net 2>/dev/null | grep -q . ; then
 		$${PKG_REMOVE} zapret2-ip2net
 	fi
 	if [ ! -d "$${ZAPRET_DIR}" ]; then
@@ -251,6 +363,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	chmod 644 $${ZAPRET_DIR}/ipset_def/*.txt >/dev/null 2>&1
 	chmod 644 $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.sh >/dev/null 2>&1
 	chmod 644 $${ZAPRET_DIR}/config* >/dev/null 2>&1
+	# cleanup custom.d directory
+	rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*-opkg*
+	rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.opkg*
+	rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.apk*
 	# creating main config if its not exists
 	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
 		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"

zapret2/comfunc.sh

@@ -170,17 +170,25 @@ function merge_cfg_with_def_values
 
 function remove_cron_task_logs
 {
-	if [ -f "$CRONTAB_FILE" ]; then
-		sed -i "/-name '$ZAPRET_CFG_NAME+\*.log' -size +/d" "$CRONTAB_FILE"
+	[ ! -f $CRONTAB_FILE ] && return 0
+	if grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size " $CRONTAB_FILE; then
+		sed -i "/-name '$ZAPRET_CFG_NAME+\*.log' -size /d" $CRONTAB_FILE
+		#/etc/init.d/cron restart 2> /dev/null
 	fi
 }
 
 function insert_cron_task_logs
 {
-	[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
-	[ ! -f "$CRONTAB_FILE" ] && return 1
-	if ! grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size \+" "$CRONTAB_FILE"; then
-		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
+	local daemon_log_size_max=${1:-2000}
+	[ ! -f $CRONTAB_FILE ] && touch $CRONTAB_FILE
+	[ ! -f $CRONTAB_FILE ] && return 1
+	if ! grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size " $CRONTAB_FILE; then
+		case "$daemon_log_size_max" in
+			''|'0'|*[!0-9]*)
+				daemon_log_size_max=2000
+				;;
+		esac
+		echo "*/1 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +${daemon_log_size_max}k -exec rm -f {} \;" >> $CRONTAB_FILE
 		/etc/init.d/cron restart 2> /dev/null
 	fi
 	return 0
@@ -188,15 +196,19 @@ function insert_cron_task_logs
 
 function init_before_start
 {
-	local DAEMON_LOG_ENABLE=$1
+	local daemon_log_enable=$1
+	local daemon_log_size_max=${2:-2000}
 	local HOSTLIST_FN="$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
 	[ ! -f "$HOSTLIST_FN" ] && touch "$HOSTLIST_FN"
 	chmod 644 $ZAPRET_BASE/ipset/*.txt
 	chmod 666 $ZAPRET_BASE/ipset/*.log
+	rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*-opkg*
+	rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*.opkg*
+	rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*.apk*
 	rm -f /tmp/$ZAPRET_CFG_NAME+*.log
 	#*/
-	if [ "$DAEMON_LOG_ENABLE" = "1" ]; then
-		insert_cron_task_logs
+	if [ "$daemon_log_enable" = "1" ]; then
+		insert_cron_task_logs "$daemon_log_size_max"
 	else
 		remove_cron_task_logs
 	fi

zapret2/config.default

@@ -148,5 +148,5 @@ FILTER_TTL_EXPIRED_ICMP=1
 
 
 DAEMON_LOG_ENABLE=0
-
+DAEMON_LOG_SIZE_MAX=2000
 DAEMON_LOG_FILE="/tmp/zapret2+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log"

zapret2/custom.d/50-script.sh

@@ -3,7 +3,7 @@
 # NOTE: @ih requires nft 1.0.1+ and updated kernel version. it's confirmed to work on 5.15 (openwrt 23) and not work on 5.10 (openwrt 22)
 
 # can override in config :
-NFQWS_OPT_DESYNC_STUN="${NFQWS_OPT_DESYNC_STUN:---payload stun --lua-desync=fake:blob=0x00000000000000000000000000000000:repeats=2}"
+NFQWS_OPT_DESYNC_STUN="${NFQWS_OPT_DESYNC_STUN:---payload=stun --lua-desync=fake:blob=0x00000000000000000000000000000000:repeats=2}"
 
 alloc_dnum DNUM_STUN4ALL
 alloc_qnum QNUM_STUN4ALL

zapret2/def-cfg.sh

@@ -19,6 +19,7 @@ function set_cfg_reset_values
 		set $cfgname.config.DISABLE_CUSTOM='1'
 		set $cfgname.config.WS_USER='daemon'
 		set $cfgname.config.DAEMON_LOG_ENABLE='0'
+		set $cfgname.config.DAEMON_LOG_SIZE_MAX='2000'
 		set $cfgname.config.DAEMON_LOG_FILE='/tmp/zapret2+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log'
 		# autohostlist options
 		set $cfgname.config.AUTOHOSTLIST_INCOMING_MAXSEQ='4096'
@@ -80,7 +81,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS2_PORTS_UDP='443'
 			set $cfgname.config.NFQWS2_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=80
 				--filter-l7=http <HOSTLIST>
@@ -109,7 +110,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS2_PORTS_UDP='443'
 			set $cfgname.config.NFQWS2_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=80
 				--filter-l7=http <HOSTLIST>
@@ -136,7 +137,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS2_PORTS_UDP='443'
 			set $cfgname.config.NFQWS2_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=80
 				--filter-l7=http <HOSTLIST>
@@ -155,7 +156,124 @@ function set_cfg_nfqws_strat
 				--filter-udp=443
 				--filter-l7=quic <HOSTLIST_NOAUTO>
 				--payload=quic_initial
-				--lua-desync=fake:blob=fake_default_quic:repeats=4
+				--lua-desync=fake:blob=fake_default_quic:repeats=11
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v1_by_AnonymTsk" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS2_PORTS_UDP='443'
+			set $cfgname.config.NFQWS2_OPT="
+				--comment=Strategy__$strat
+				
+				--blob=blob_tls_clienthello_www_google_com:@/opt/zapret2/files/fake/tls_clienthello_www_google_com.bin 
+				--blob=blob_quic_initial_www_google_com:@/opt/zapret2/files/fake/quic_initial_www_google_com.bin
+				
+				--filter-tcp=443,80
+				--filter-l7=http,tls <HOSTLIST>
+				--payload=tls_client_hello
+				--lua-desync=fake:blob=fake_default_tls:tls_mod=rnd,dupsid,sni=www.google.com:tcp_ts=-1000
+				--lua-desync=multidisorder:pos=1,midsld,sniext+1,endhost-2,-10:seqovl=1:seqovl_pattern=blob_tls_clienthello_www_google_com:tcp_ts_up
+				--payload=http_req
+				--lua-desync=http_methodeol:badsum
+				
+				--new
+				--filter-udp=443
+				--filter-l7=quic <HOSTLIST_NOAUTO>
+				--payload=quic_initial
+				--lua-desync=fake:blob=blob_quic_initial_www_google_com:repeats=11
+				
+				--new
+				--filter-udp=590-600,1400,3478-3481,5349,19294-19344,50000-65535
+				--filter-l7=wireguard,stun,discord,mtproto
+				--out-range=-n1
+				--payload=wireguard_initiation,wireguard_response,wireguard_cookie,stun,discord_ip_discovery,mtproto_initial
+				--lua-desync=fake:blob=quic_initial:repeats=6
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v1_by_Routerich" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS2_PORTS_UDP='443'
+			set $cfgname.config.NFQWS2_OPT="
+				--comment=Strategy__$strat
+				
+				--blob=blob_tls_clienthello_www_google_com:@/opt/zapret2/files/fake/tls_clienthello_www_google_com.bin
+				--blob=blob_tls_clienthello_vk_com:@/opt/zapret2/files/fake/tls_clienthello_vk_com.bin
+				--blob=blob_tls_clienthello_gosuslugi_ru:@/opt/zapret2/files/fake/tls_clienthello_gosuslugi_ru.bin
+				--blob=blob_tls_clienthello_www_onetrust_com:@/opt/zapret2/files/fake/tls_clienthello_www_onetrust_com.bin
+				--blob=blob_tls_clienthello_t2_ru:@/opt/zapret2/files/fake/t2.bin
+				--blob=blob_tls_clienthello_www_4pda_to:@/opt/zapret2/files/fake/4pda.bin
+				
+				--filter-tcp=443
+				--filter-l3=ipv4
+				--filter-l7=tls
+				--hostlist=/opt/zapret2/ipset/zapret-hosts-google.txt
+				--out-range=-s34228
+				--in-range=-s5556 --lua-desync=circular:fails=2:maxtime=60
+				--in-range=x
+				--payload=tls_client_hello
+				--lua-desync=fake:blob=0x0F0F0F0F:tcp_seq=-10000:tcp_ack=-66000:badsum:strategy=1
+				--lua-desync=fake:blob=blob_tls_clienthello_www_google_com:optional:tcp_seq=-10000:tcp_ack=-66000:badsum:tls_mod=rnd,dupsid,sni=ggpht.com:strategy=1
+				--lua-desync=multisplit:pos=2,sld:seqovl=620:seqovl_pattern=blob_tls_clienthello_www_google_com:strategy=1
+				--lua-desync=fake:blob=0x00000000:tcp_ack=-66000:strategy=2
+				--lua-desync=fake:blob=blob_tls_clienthello_www_google_com:tls_mod=rnd,dupsid,rndsni,padencap:tcp_ack=-66000:strategy=2
+				--lua-desync=multisplit:pos=2,endhost:strategy=2
+				--lua-desync=multisplit:pos=1:seqovl=681:seqovl_pattern=blob_tls_clienthello_www_google_com:ip_id=zero:strategy=3
+				--lua-desync=multisplit:pos=1,sniext+1:seqovl=1:strategy=4
+				--lua-desync=multisplit:seqovl=681:seqovl_pattern=blob_tls_clienthello_www_google_com:strategy=5
+				--lua-desync=fake:blob=blob_tls_clienthello_www_google_com:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=rnd,dupsid,sni=fonts.google.com:strategy=6
+				--lua-desync=fake:blob=0x0F0F0F0F:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=none:strategy=6
+				--lua-desync=fakeddisorder:pos=10,midsld:seqovl=336:seqovl_pattern=blob_tls_clienthello_gosuslugi_ru:pattern=blob_tls_clienthello_vk_com:tcp_seq=0:tcp_ack=-66000:badsum:strategy=6
+				--lua-desync=multidisorder:pos=7,sld+1:strategy=7
+				--lua-desync=multidisorder:pos=1,midsld,endhost-1:strategy=8
+				--lua-desync=fake:blob=0x00000000:tcp_seq=-10000:tcp_ack=-66000:repeats=2:strategy=9
+				--lua-desync=fake:blob=fake_default_tls:tcp_seq=-10000:tcp_ack=-66000:repeats=2:tls_mod=rnd,dupsid,sni=www.google.com:strategy=9
+				--lua-desync=multisplit:pos=1,midsld:strategy=9
+				--lua-desync=multidisorder:pos=1,midsld:strategy=10
+				--lua-desync=multisplit:pos=1,2:seqovl=4:seqovl_pattern=blob_tls_clienthello_www_google_com:strategy=11
+				--lua-desync=multidisorder:pos=2,5,105,host+5,sld-1,endsld-5,endsld:strategy=12
+				--lua-desync=fake:blob=0x0F0F0F0F:badsum:tcp_seq=-10000:tcp_ack=-66000:strategy=13
+				--lua-desync=fake:blob=blob_tls_clienthello_www_google_com:badsum:tcp_seq=-10000:tcp_ack=-66000:tls_mod=rnd,dupsid,sni=ggpht.com:strategy=13
+				--lua-desync=multisplit:pos=2,sld:seqovl=2108:seqovl_pattern=blob_tls_clienthello_www_google_com:strategy=13
+				--lua-desync=hostfakesplit:midhost=host-2:host=rzd.ru:tcp_seq=0:tcp_ack=-66000:badsum:strategy=14:final
+				
+				--new
+				--filter-tcp=443
+				--filter-l3=ipv4
+				--filter-l7=tls <HOSTLIST>
+				--out-range=-s34228
+				--in-range=-s5556 --lua-desync=circular:fails=2:maxtime=60
+				--in-range=x
+				--payload=tls_client_hello
+				--lua-desync=fake:blob=blob_tls_clienthello_www_onetrust_com:tcp_ts=-600000:repeats=8:strategy=1
+				--lua-desync=multisplit:pos=1:seqovl=654:seqovl_pattern=blob_tls_clienthello_www_onetrust_com:strategy=1
+				--lua-desync=fake:blob=blob_tls_clienthello_t2_ru:tls_mod=rnd,dupsid,sni=m.ok.ru:badsum:tcp_seq=-10000:strategy=2
+				--lua-desync=fake:blob=0x0F0F0F0F:tls_mod=none:badsum:tcp_seq=-10000:strategy=2
+				--lua-desync=fakeddisorder:pos=10,midsld:pattern=blob_tls_clienthello_vk_com:seqovl=336:seqovl_pattern=blob_tls_clienthello_gosuslugi_ru:badsum:tcp_seq=-10000:strategy=2
+				--lua-desync=fake:blob=fake_default_tls:tcp_seq=10000000:tcp_ack=-66000:repeats=2:tls_mod=rnd,dupsid,sni=fonts.google.com:strategy=3
+				--lua-desync=multidisorder:pos=1:seqovl=681:seqovl_pattern=blob_tls_clienthello_www_google_com:strategy=3
+				--lua-desync=fake:blob=blob_tls_clienthello_www_google_com:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=rnd,dupsid,sni=fonts.google.com:strategy=4
+				--lua-desync=fake:blob=0x0F0F0F0F:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=none:strategy=4
+				--lua-desync=fakeddisorder:pos=10,midsld:seqovl=336:seqovl_pattern=blob_tls_clienthello_gosuslugi_ru:pattern=blob_tls_clienthello_vk_com:tcp_seq=0:tcp_ack=-66000:badsum:strategy=4
+				--lua-desync=fake:blob=blob_tls_clienthello_t2_ru:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=rnd,dupsid,sni=m.ok.ru:strategy=5
+				--lua-desync=fake:blob=0x0F0F0F0F:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=none:strategy=5
+				--lua-desync=fakeddisorder:pos=10,midsld:seqovl=336:seqovl_pattern=blob_tls_clienthello_gosuslugi_ru:pattern=blob_tls_clienthello_vk_com:tcp_seq=0:tcp_ack=-66000:badsum:strategy=5
+				--lua-desync=multisplit:pos=1:seqovl=582:seqovl_pattern=blob_tls_clienthello_www_4pda_to:strategy=6
+				--lua-desync=fake:blob=blob_tls_clienthello_www_onetrust_com:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=rnd,dupsid:strategy=7
+				--lua-desync=fake:blob=0x0F0F0F0F:tcp_seq=0:tcp_ack=-66000:badsum:tls_mod=none:strategy=7
+				--lua-desync=fakeddisorder:pos=10,midsld:pattern=blob_tls_clienthello_vk_com:tcp_seq=0:tcp_ack=-66000:badsum:strategy=7
+				--lua-desync=hostfakesplit:midhost=host-2:host=rzd.ru:tcp_seq=0:tcp_ack=-66000:badsum:strategy=8:final				
+				
+				--new
+				--filter-udp=443
+				--filter-l7=quic <HOSTLIST_NOAUTO>
+				--payload=quic_initial
+				--lua-desync=fake:blob=fake_default_quic:repeats=11
 			"
 			commit $cfgname
 		EOF

zapret2/dwc.sh

@@ -3,13 +3,15 @@
 
 ZAP_TMP_DIR=/tmp/zapret2_dwc
 
+opt_sites=
 opt_dig=
 opt_recom=
 opt_tmp_dir=
 opt_test=
 
-while getopts "d:RT:t" opt; do
+while getopts "sd:RT:t" opt; do
 	case $opt in
+		s) opt_sites="true";;
 		d) opt_dig="$OPTARG";;
 		R) opt_recom="true";;     # Recommendations
 		T) opt_tmp_dir="$OPTARG";;
@@ -24,8 +26,8 @@ TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
 [ -f "$TARGET_LIST_FILE" ] && rm -rf "$ZAP_TMP_DIR"
 [ -f "$TARGET_LIST_FILE" ] && exit 3
 
-CURL_TIMEOUT=5
-CURL_RANGETO=65535
+CURL_TIMEOUT=7
+CURL_MAXBODY=65536
 CURL_NOCACHE='cache-control: no-cache'
 CURL_NOCACHE2='pragma: no-cache'
 CURL_USERAGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36'
@@ -63,58 +65,102 @@ if [ -f /etc/openwrt_release ]; then
 		return 15
 	fi
 fi
- 
+
+mkdir -p "$ZAP_TMP_DIR"
+
 #echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
 #echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'
 
-TEST_SUITE='[
-  { id: "US.CF-01", provider: "🇺🇸 Cloudflare", times: 1, url: "https://img.wzstats.gg/cleaver/gunFullDisplay" },
-  { id: "US.CF-02", provider: "🇺🇸 Cloudflare", times: 1, url: "https://genshin.jmp.blue/characters/all#" },
-  { id: "US.CF-03", provider: "🇺🇸 Cloudflare", times: 1, url: "https://api.frankfurter.dev/v1/2000-01-01..2002-12-31" },
-  { id: "US.CF-04", provider: "🇨🇦 Cloudflare", times: 1, url: "https://www.bigcartel.com/" },
-  { id: "US.DO-01", provider: "🇺🇸 DigitalOcean", times: 2, url: "https://genderize.io/" },
-  { id: "DE.HE-01", provider: "🇩🇪 Hetzner", times: 1, url: "https://j.dejure.org/jcg/doctrine/doctrine_banner.webp" },
-  { id: "DE.HE-02", provider: "🇩🇪 Hetzner", times: 1, url: "https://maps.gnosis.earth/ogcapi/api/swagger-ui/swagger-ui-standalone-preset.js#" },
-  { id: "FI.HE-01", provider: "🇫🇮 Hetzner", times: 1, url: "https://251b5cd9.nip.io/1MB.bin" },
-  { id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8c176.nip.io/1MB.bin" },
-  { id: "FI.HE-03", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bdae.nip.io/1MB.bin" },
-  { id: "FI.HE-04", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bca5.nip.io/1MB.bin" },
-  { id: "FR.OVH-01", provider: "🇫🇷 OVH", times: 1, url: "https://eu.api.ovh.com/console/rapidoc-min.js" },
-  { id: "FR.OVH-02", provider: "🇫🇷 OVH", times: 1, url: "https://ovh.sfx.ovh/10M.bin" },
-  { id: "SE.OR-01", provider: "🇸🇪 Oracle", times: 1, url: "https://oracle.sfx.ovh/10M.bin" },
-  { id: "DE.AWS-01", provider: "🇩🇪 AWS", times: 1, url: "https://www.getscope.com/assets/fonts/fa-solid-900.woff2" },
-  { id: "US.AWS-01", provider: "🇺🇸 AWS", times: 1, url: "https://corp.kaltura.com/wp-content/cache/min/1/wp-content/themes/airfleet/dist/styles/theme.css" },
-  { id: "US.GC-01", provider: "🇺🇸 Google Cloud", times: 1, url: "https://api.usercentrics.eu/gvl/v3/en.json" },
-  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/footer/footer-element-es2015.js" },
-  { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
-  { id: "US.AKM-01", provider: "🇺🇸 Akamai", times: 1, url: "https://www.roxio.com/static/roxio/images/products/creator/nxt9/call-action-footer-bg.jpg" },
-  { id: "PL.AKM-01", provider: "🇵🇱 Akamai", times: 1, url: "https://media-assets.stryker.com/is/image/stryker/gateway_1?$max_width_1410$" },
-  { id: "US.CDN77-01", provider: "🇺🇸 CDN77", times: 1, url: "https://cdn.eso.org/images/banner1920/eso2520a.jpg" },
-  { id: "FR.CNTB-01", provider: "🇫🇷 Contabo", times: 1, url: "https://airsea.no/images/main_logo.png" },
-  { id: "NL.SW-01", provider: "🇳🇱 Scaleway", times: 1, url: "https://www.velivole.fr/img/header.jpg" },
-  { id: "US.CNST-01", provider: "🇺🇸 Constant", times: 1, url: "https://cdn.xuansiwei.com/common/lib/font-awesome/4.7.0/fontawesome-webfont.woff2?v=4.7.0" }
-]'
+TEST_SUITE_URL="https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/suite.json"
+TEST_SUITE_FN="$ZAP_TMP_DIR/${TEST_SUITE_URL##*/}"
+TEST_SUITE_HDR="$TEST_SUITE_FN.hdr"
+rm -f "$TEST_SUITE_FN"
+rm -f "$TEST_SUITE_HDR"
+
+#echo "Download $TEST_SUITE_URL ..."
+curl -s -L -D "$TEST_SUITE_HDR" -o "$TEST_SUITE_FN" --max-time 15 "$TEST_SUITE_URL" 2>/dev/null
+if [ ! -f "$TEST_SUITE_HDR" ] || [ -z "$TEST_SUITE_HDR" ] ; then
+	echo "ERROR: Cannot download file \"$TEST_SUITE_URL\" (connection problem)"
+	return 17
+fi
+RESP_STATUS=$( cat "$TEST_SUITE_HDR" | head -n 1 | awk '{print $2}' )
+if [ "$RESP_STATUS" != 200 ]; then
+	echo "ERROR: Cannot download file \"$TEST_SUITE_URL\" (status = $RESP_STATUS)"
+	return 18
+fi
+if [ ! -f "$TEST_SUITE_FN" ] || [ -z "$TEST_SUITE_FN" ] ; then
+	echo "ERROR: Cannot download file \"$TEST_SUITE_URL\" (resp body empty)"
+	return 19
+fi
+if [ "$(head -c 2 "$TEST_SUITE_FN" 2>/dev/null)" != "$(printf '[\n')" ]; then
+	echo "ERROR: incorrect format of \"$TEST_SUITE_URL\""
+	return 19
+fi
+
+TEST_SUITE='
+	gosuslugi.ru          | @  |  40000 | https://gosuslugi.ru/__jsch/static/script.js
+	esia.gosuslugi.ru     | @  |  40000 | https://esia.gosuslugi.ru/__jsch/static/script.js
+	gu-st.ru              |    |        | https://gu-st.ru/portal-st/lib-assets/fonts/Lato-Regular-v3.woff2
+	nalog.ru              |    |        | https://data.nalog.ru/images/new/buttons/TSET-button.png
+	lkfl2.nalog.ru        |    |        | https://lkfl2.nalog.ru/lkfl/static/assets/main-desktop-1920-CvJsHANg.jpg
+	rutube.ru             | @  |  40000 | https://static.rutube.ru/static/wdp/fonts/Semibold/OpenSans-Semibold.woff2?20231026
+	youtube.com           | @# | 300000 | https://youtube.com
+	googlevideo.com       |    | 210000 | https://redirector.googlevideo.com/report_mapping
+	instagram.com         | @# | 300000 | https://instagram.com
+	rutracker.org         | @# |  80000 | https://rutracker.org
+	nnmclub.to            | @# | 120000 | https://nnmclub.to
+	rutor.info            | @# | 110000 | https://rutor.info
+	epidemz.net.co        | @# |  40000 | https://epidemz.net.co
+	filmix.my             | @  |  23000 | https://filmix.my/templates/Filmix/media/fonts/Roboto/roboto-v20-latin_cyrillic-italic.woff2
+	openwrt.org           | +  |  60000 | https://openwrt.org/lib/tpl/bootstrap3/assets/bootstrap/default/bootstrap.min.css
+	ntc.party             | @# | 200000 | https://ntc.party
+	sxyprn.net            | @# | 310000 | https://sxyprn.net
+	pornhub.com           | @# | 700000 | https://pornhub.com
+	spankbang.com         | @# |  80000 | https://spankbang.com
+	discord.com           | @# | 120000 | https://discord.com
+	x.com                 | @  |  39000 | https://abs.twimg.com/fonts/v1/chirp-extended-heavy-web.woff2
+	flightradar24.com     | @  | 100000 | https://www.flightradar24.com/mobile/airlines?format=2&version=0
+	cdn77.com             | @  |  24000 | https://cdn77.com/fonts/Eina01-Regular.woff2
+	play.google.com       | @# | 100000 | https://gstatic.com/feedback/js/help/prod/service/lazy.min.js
+	genderize.io          | @# | 210000 | https://genderize.io
+	ottai.com             | @  |  70000 | https://seas.static.ottai.com/ottai-website/public/images/new/home/banner/uk/banner.webp
+'
+
+if [ "$opt_sites" = true ]; then
+	CURL_TIMEOUT=7
+else
+	CURL_TIMEOUT=7
+	TEST_SUITE=$( cat "$TEST_SUITE_FN" )
+fi
 
 function trim
 {
 	echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
 }
 
-mkdir -p "$ZAP_TMP_DIR"
-
 : > "$TARGET_LIST_FILE"
 IDX=0
 while IFS= read -r line; do
+	if [ "$opt_sites" = true ]; then
+		echo -n "$line" | grep -q ' | http' || continue
+		IDX=$((IDX + 1))
+		TAG=$( printf '%s\n' "$line" | cut -d'|' -f1 | awk '{$1=$1;print}' )
+		FLAGS=$( printf '%s\n' "$line" | cut -d'|' -f2 | awk '{$1=$1;print}' )
+		TSIZE=$( printf '%s\n' "$line" | cut -d'|' -f3 | awk '{$1=$1;print}' )
+		URL=$( printf '%s\n' "$line" | cut -d'|' -f4 | awk '{$1=$1;print}' )
+		COUNTRY="XX"
+		echo "${IDX}|${TAG}|${COUNTRY}|${FLAGS}|${TSIZE}|${URL}" >> "$TARGET_LIST_FILE"
+		continue
+	fi
 	case "$line" in
-		*id:*provider:*url:*)
+		*id*provider*thresholdBytes*url*)
 			IDX=$((IDX + 1))
-			TAG=$( printf '%s\n' "$line" | cut -d'"' -f2 )
+			TAG=$( printf '%s\n' "$line" | cut -d'"' -f4 )
 			COUNTRY="${TAG%%.*}"
-			PROVIDER_RAW=$( printf '%s\n' "$line" | cut -d'"' -f4 )
-			PROVIDER="${PROVIDER_RAW#* }"
-			TIMES=$( printf '%s\n' "$line" | cut -d':' -f4 | cut -d',' -f1 | tr -d ' ')
-			URL=$( printf '%s\n' "$line" | cut -d'"' -f6 )
-			echo "${IDX}|${TAG}|${COUNTRY}|${PROVIDER}|${TIMES}|${URL}" >> "$TARGET_LIST_FILE"
+			PROVIDER=$( printf '%s\n' "$line" | cut -d'"' -f8 )
+			BYTES=$( printf '%s\n' "$line" | cut -d'"' -f15 | cut -d':' -f2 | cut -d',' -f1 | tr -d ' ')
+			URL=$( printf '%s\n' "$line" | cut -d'"' -f20 )
+			echo "${IDX}|${TAG}|${COUNTRY}|${PROVIDER}|${BYTES}|${URL}" >> "$TARGET_LIST_FILE"
 		;;
 	esac
 done <<EOF
@@ -125,44 +171,78 @@ CURL_CON_TIMEOUT=$((CURL_TIMEOUT-2))
 CURL_SPEED_TIME=$((CURL_TIMEOUT-2))
 CURL_SPEED_LIMIT=1
 
-while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
+while IFS='|' read -r ID TAG COUNTRY PROVIDER TSIZE URL; do
 	[ -z "$TAG" ] && continue
-	ID=$((ID+1))
 	ID3=$( printf '%03d' "$ID" )
-	COUNTRY=$( echo "$TAG" | cut -d. -f1 )
-	CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
+	RANGETO=""
+	REDIRECT=""
+	USERAGENT="$CURL_USERAGENT"
+	if [ "$opt_sites" = true ]; then
+		FLAGS="$PROVIDER"
+		[ "$TSIZE" = "" ] && TSIZE=$CURL_MAXBODY
+		if echo "$FLAGS" | grep -q '@'; then
+			RANGETO=""
+		else
+			RANGETO="--range 0-$((TSIZE - 1))"
+		fi
+		PROVIDER="@"
+		if echo "$FLAGS" | grep -q '#'; then
+			REDIRECT="-L"
+		fi
+		if echo "$FLAGS" | grep -q '+'; then
+			USERAGENT="curl/8.12"
+		fi
+	else
+		RANGETO="--range 0-$((TSIZE - 1))"
+		COUNTRY=$( echo "$TAG" | cut -d. -f1 )
+	fi
 	URL_NO_PROTO="${URL#*://}"
 	DOMAIN="${URL_NO_PROTO%%/*}"
 	URLPATH="/${URL_NO_PROTO#*/}"
 	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
 	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
-	FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
+	FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER=$TSIZE"
 	(
+		echo ">>>>> Request destination IP-addr"
 		DST_IP=
 		RESOLVE_OPT=
 		if [ "$opt_dig" != "" ]; then
-			DST_IP=$( dig +time=2 +retry=1 $OPT_DIG_DNS +short "$DOMAIN" 2>/dev/null | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
+			RESP=$( dig +time=2 +retry=1 $OPT_DIG_DNS +short "$DOMAIN" 2>&1 )
+			echo "$RESP"
+			DST_IP=$( echo "$RESP" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
 		else
-			CURL_TIMEOUTS="--connect-timeout 2 --max-time 3 --speed-time 3 --speed-limit 1"
-			DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
+			CURL_TIMEOUTS="--connect-timeout 3 --max-time 4 --speed-time 4 --speed-limit 1"
+			RESP=$( curl -4 -I --no-progress-meter $CURL_TIMEOUTS -w '%{remote_ip}\n' "$URL" 2>&1 )
+			echo "$RESP"
+			DST_IP=$( echo "$RESP" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | tail -1 )
 			if [ -z "$DST_IP" ]; then
-				DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
+				echo "----------------------------------"
+				RESP=$( curl -4 --no-progress-meter $CURL_TIMEOUTS -r 0-0 -w '%{remote_ip}\n' "$URL" 2>&1 )
+				echo "$RESP"
+				DST_IP=$( echo "$RESP" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | tail -1 )
 			fi
 		fi
 		if [ "$DST_IP" = "" ]; then
-			DST_IP=$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p' )
+			echo ">>>>> PING"
+			RESP=$( ping -c1 "$DOMAIN" 2>&1 )
+			echo "$RESP"
+			DST_IP=$( echo "$RESP" | sed -n '1s/.*(\([0-9.]*\)).*/\1/p' )
 		fi
+		echo ">>>>> Destination IP-addr:"
+		echo "$DST_IP"
 		[ "$DST_IP" != "" ] && RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
 		echo "$DST_IP" > "$FNAME.ip"
 		echo "$URL" > "$FNAME.url"
+		echo ">>>>> Download target body"
 		curl "$URL" \
 			$RESOLVE_OPT \
+			$REDIRECT \
 			--connect-timeout $CURL_CON_TIMEOUT \
 			--max-time $CURL_TIMEOUT \
 			--speed-time $CURL_SPEED_TIME \
 			--speed-limit $CURL_SPEED_LIMIT	\
-			--range 0-$CURL_RANGETO \
-			-A "$CURL_USERAGENT" \
+			$RANGETO \
+			-A "$USERAGENT" \
 			-D "$FNAME.hdr" \
 			-o "$FNAME.body"
 	) > "$FNAME.log" 2>&1 &
@@ -180,6 +260,7 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	ID=$( echo "$FILENAME" | cut -d= -f1)
 	TAG=$( echo "$FILENAME" | cut -d= -f2)
 	PROVIDER=$(echo "$FILENAME" | cut -d= -f3 )
+	TSIZE=$(echo "$FILENAME" | cut -d= -f4 )
 	FNAME="$ZAP_TMP_DIR/$FILENAME"
 	BODY_SIZE=0
 	[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
@@ -196,7 +277,7 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	elif [ ! -s "$FNAME.body" ]; then
 		status="Possibly detected"
 	else
-		if [ "$BODY_SIZE" -le $CURL_RANGETO ]; then
+		if [ $BODY_SIZE -lt $TSIZE ]; then
 			status="Failed (recv $BODY_SIZE bytes)"
 			res=5
 		else
@@ -204,7 +285,11 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 			res=100
 		fi
 	fi
-	printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
+	if [ "$opt_sites" = true ]; then
+		printf '%18s / %-15s : %s \n' "$TAG" "$IPADDR" "$status"
+	else
+		printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
+	fi
 	echo "$BODY_SIZE" > "$FNAME.size"
 	if [ $res != 100 ]; then
 		URL=$( cat "$FNAME.url" )
@@ -212,7 +297,9 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	fi
 done
 
-rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
+if [ "$opt_test" != true ]; then
+	rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
+fi
 
 [ "$opt_recom" != "true" ] && return 0
 

zapret2/init.d.sh

@@ -70,18 +70,18 @@ function boot
 			fi
 		fi
 	fi
-	init_before_start "$DAEMON_LOG_ENABLE"
+	init_before_start "$DAEMON_LOG_ENABLE" "$DAEMON_LOG_SIZE_MAX"
 	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD start "$@"
 }
 
 function start
 {
-	init_before_start "$DAEMON_LOG_ENABLE"
+	init_before_start "$DAEMON_LOG_ENABLE" "$DAEMON_LOG_SIZE_MAX"
 	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD start "$@"
 }
 
 function restart
 {
-	init_before_start "$DAEMON_LOG_ENABLE"
+	init_before_start "$DAEMON_LOG_ENABLE" "$DAEMON_LOG_SIZE_MAX"
 	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD restart "$@"
 }

zapret2/ipset/zapret-hosts-user-exclude.txt

@@ -11,6 +11,7 @@ fe80::/10
 nalog.ru
 gstatic.com
 gosuslugi.ru
+mos.ru
 mos-gorsud.ru
 gov.ru
 sudrf.ru
@@ -18,6 +19,10 @@ ottai.com
 ipstream.one
 vkusvill.ru
 kinopoisk.ru
+vk.ru
+vk.com
+yandex.ru
+ya.ru
 #################################### Epicgames
 easy.ac
 fab.com
@@ -284,4 +289,52 @@ huaweicloud-dns.cn
 huaweicloud-dns.ru
 huaweicloud-dns.com
 huaweicloud-dns.org
+#################################### Okko
+okko.tv
+playfamily.ru
+#################################### Beeline
+beeline.ru
+beeline.tv
+#################################### Delta Force
+volces.com
+wetest.net
+intlgame.com
+fleetlogd.com
+dgameglobal.com
+tdatamaster.com
+playdeltaforce.com
+quovadisglobal.com
+jupiterlauncher.com
+anticheatexpert.com
+#################################### Microsoft
+live.com
+lync.com
+skype.com
+microsoft
+msauth.net
+office.net
+office.com
+msocdn.com
+mojang.com
+windows.net
+msftauth.net
+xboxlive.com
+microsoft.com
+office365.com
+azureedge.net
+skypeassets.com
+windowsupdate.com
+microsoftonline.com
+microsoftonline-p.com
+minecraftservices.com
+#################################### Arknights: Endfield
+skport.com
+hg-cdn.com
+helpshift.com
+gryphline.com
+#################################### Samsung
+samsungosp.com
+samsungqbe.com
+amazontrust.com
+samsungcloudsolution.com
 ####################################

zapret2/script-exec.sh

@@ -1,15 +1,37 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
+PID_FILE=/tmp/zapret-script-exec.pid
+if [ -f $PID_FILE ]; then
+	echo "ERROR: file $PID_FILE already exists!" | awk 'NR==1'
+	exit 70
+fi
 LOG_FILE=$1
 RC_FILE=$1.rc
-shift 1
-: > $LOG_FILE
-: > $RC_FILE
-(
-	exec </dev/null >/dev/null 2>&1
-	"$@" >> $LOG_FILE 2>&1
-	RETCODE=$?
-	sleep 1
-	echo $RETCODE > $RC_FILE
-) &
+SH_FILE=$2
+shift 2
+if [ ! -e $SH_FILE ]; then
+	echo "ERROR: script $SH_FILE not found!" | awk 'NR==1'
+	exit 71
+fi
+if [ ! -x $SH_FILE ]; then
+	echo "ERROR: script $SH_FILE not Found!" | awk 'NR==1'
+	exit 72
+fi
+start-stop-daemon -S -b -p $PID_FILE -x /bin/sh -- -c '
+	LOG_FILE=$1
+	RC_FILE=$2
+	SH_FILE=$3
+	shift 3
+	printf "" > $LOG_FILE
+	printf "" > $RC_FILE
+	$SH_FILE "$@" >> $LOG_FILE 2>&1
+	RET_CODE=$?
+	echo $RET_CODE > $RC_FILE
+' sh $LOG_FILE $RC_FILE $SH_FILE "$@"
+RET_CODE=$?
+if [ $RET_CODE != 0 ]; then
+	echo "ERROR: script $SH_FILE not executed! ret_code = $RET_CODE" | awk 'NR==1'
+	exit $RET_CODE
+fi
+echo "Script $SH_FILE running..." | awk 'NR==1'
 exit 0

zapret2/sync_config.sh

@@ -93,6 +93,7 @@ sync_param MODE_FILTER
 sync_param DISABLE_CUSTOM
 sync_param WS_USER str
 sync_param DAEMON_LOG_ENABLE
+sync_param DAEMON_LOG_SIZE_MAX
 sync_param DAEMON_LOG_FILE str
 
 sync_param AUTOHOSTLIST_RETRANS_THRESHOLD

zapret2/update-pkg.sh

@@ -89,6 +89,16 @@ fi
 
 # -------------------------------------------------------------------------------------------------------
 
+function check_pkg_installed
+{
+	local pkg_name="$1"
+	if [ "$PKG_MGR" = apk ]; then
+		apk info -e "$pkg_name" >/dev/null 2>&1; 
+	else
+		opkg status "$pkg_name" 2>/dev/null | grep -q .
+	fi
+}
+
 function get_distrib_param
 {
 	local parname=$1
@@ -475,7 +485,7 @@ if [ "$opt_update" != "" ]; then
 	mkdir $ZAP_PKG_DIR
 	ZAP_PKG_FN="$ZAP_PKG_DIR/${ZAP_PKG_URL##*/}"
 	echo "Download ZIP-file..."
-	curl -s -L --max-time 15 -H "$CURL_HEADER2" "$ZAP_PKG_URL" -o "$ZAP_PKG_FN"
+	curl -s -L --retry 5 --retry-delay 1 --retry-max-time 55 --retry-all-errors --max-time 30 -H "$CURL_HEADER2" "$ZAP_PKG_URL" -o "$ZAP_PKG_FN"
 	if [ $? -ne 0 ]; then
 		echo "ERROR: cannot download package!"
 		return 215
@@ -529,11 +539,11 @@ if [ "$opt_update" != "" ]; then
 	if [ "$opt_forced" = true ]; then
 		pkg_mgr_update
 	fi
-	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-mdig >/dev/null 2>&1; then
+	if check_pkg_installed ${ZAPRET_CFG_NAME}-mdig; then
 		echo "Uninstall mdig..."
 		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-mdig
 	fi
-	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-ip2net >/dev/null 2>&1; then
+	if check_pkg_installed ${ZAPRET_CFG_NAME}-ip2net; then
 		echo "Uninstall ip2net..."
 		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-ip2net
 	fi