Bump version to v72.20260128

luci-app-zapret/Makefile

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

luci-app-zapret/htdocs/luci-static/resources/view/zapret/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/');
@@ -36,30 +44,53 @@ return baseclass.extend({
             cmd.push(...[ '-d', dns_ip.trim() ]);
         }
         cmd.push('-R');  // show recommendations
-        let log = '/tmp/'+tools.appName+'_dwc.log';
+        return tools.execAndRead({
-        let callback = this.execAndReadCallback;
+            cmd: cmd,
-        let wnd = this;
+            log: '/tmp/'+tools.appName+'_dwc.log',
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+            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') {
+            this.appendLog('=========================================================');
-                wnd.appendLog('=========================================================');
+            return;
-                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]'));
+        }, _('DPI check'));
-        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
+        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' }, [
@@ -121,6 +159,8 @@ return baseclass.extend({
                 this.logArea,
             ]),
             E('div', { 'class': 'right' }, [
+                this.btn_sitescheck,
+                ' ',
                 this.btn_dpicheck,
                 ' ',
                 this.btn_cancel,

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

@@ -8,15 +8,17 @@
 'require view.zapret.tools as tools';
 
 return view.extend({
-    retrieveLog: async function() {
+    POLL: new tools.POLLER( { } ),
-        return Promise.all([
+    
-            L.resolveDefault(fs.stat('/bin/cat'), null),
+    retrieveLog: async function()
-            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', tools.appName+'+*.log' ]),
+    {
-            uci.load(tools.appName),
+        return tools.promiseAllDict({
-        ]).then(function(status_array) {
+            filereader   : L.resolveDefault(fs.stat('/bin/cat'), null),
-            var filereader = status_array[0] ? status_array[0].path : null;
+            log_data     : fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', tools.appName+'+*.log' ]),
-            var log_data   = status_array[1];   // stdout: multiline text
+        }).then( (data) => {
-            if (log_data.code != 0) {
+            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() {
+    load: function()
-        poll.add(this.pollLog.bind(this));
+    {
-        return await this.retrieveLog();
+        return tools.baseLoad(this, (data) => {
+            tools.load_feat_env();
+            this.svc_info = data.svc_info;
+            return this.retrieveLog();
+        });
     },
     
-    render: function(logdata) {
+    render: function(logdata)
-        if (!logdata) {
+    {
-            return;
-        }
         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-zapret/htdocs/luci-static/resources/view/zapret/env.js

@@ -32,22 +32,39 @@ return baseclass.extend({
     autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
     autoHostListDbgFN : '/opt/zapret/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 = { };
+        ctx.skey_pkg_dict = this.appName + '-pkg-dict';
-        if (L.hasSystemFeature('apk')) {
+        ctx.skey_deffered_action = this.appName + '-deffered-action';
-            dst_obj.packager.name = 'apk';
+        try {
-            dst_obj.packager.path = '/usr/bin/apk';
+            L.hasSystemFeature('opkg');
-            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
+            this.load_feat_env(ctx);
-        } else {
+        } catch(e) {
-            dst_obj.packager.name = 'opkg';
+            // nothing
-            dst_obj.packager.path = '/bin/opkg';
-            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
         }
-    }
+    },
+    
+    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-zapret/htdocs/luci-static/resources/view/zapret/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'),
+            "enable"  : elems.btn_enable  || document.getElementById('btn_enable'),
-            disable : elems.btn_disable || document.getElementById('btn_disable'),
+            "disable" : elems.btn_disable || document.getElementById('btn_disable'),
-            start   : elems.btn_start   || document.getElementById('btn_start'),
+            "start"   : elems.btn_start   || document.getElementById('btn_start'),
-            restart : elems.btn_restart || document.getElementById('btn_restart'),
+            "restart" : elems.btn_restart || document.getElementById('btn_restart'),
-            stop    : elems.btn_stop    || document.getElementById('btn_stop'),
+            "stop"    : elems.btn_stop    || document.getElementById('btn_stop'),
-            reset   : elems.btn_reset   || document.getElementById('btn_reset'),
+            "reset"   : elems.btn_reset   || document.getElementById('btn_reset'),
-            diag    : elems.btn_diag    || document.getElementById('btn_diag'),
+            "diag"    : elems.btn_diag    || document.getElementById('btn_diag'),
-            update  : elems.btn_update  || document.getElementById('btn_update'),
+            "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() {
+    getAppStatus: function()
-        return Promise.all([
+    {
-            tools.getInitState(tools.appName),      // svc_boot
+        return tools.promiseAllDict({
-            fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
+            svc_boot   : tools.getInitState(tools.appName),
-            tools.getSvcInfo(),                     // svc_info
+            svc_en     : fs.exec(tools.execPath, [ 'enabled' ]),
-            fs.exec('/bin/busybox', [ 'ps' ]),      // process list
+            svc_info   : tools.getSvcInfo(),
-            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
+            proc_list  : fs.exec('/bin/busybox', [ 'ps' ]),
-            tools.getStratList(),                   // nfqws strategy list
+            pkg_dict   : tools.getPackageDict(),
-            fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),  // CPU arch
+            strat_list : tools.getStratList(),
-            uci.load(tools.appName),              // config
+            sys_info   : fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),
-        ]).catch(e => {
+            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_boot = data.svc_boot ? true : false;
-        let svc_en    = status_array[1];   // stdout: empty or error text
+        this.nfqws_strat_list = data.strat_list;
-        let svc_info  = status_array[2];   // stdout: JSON as text
+        this.pkg_arch = tools.getConfigPar(data.sys_info.stdout, 'DISTRIB_ARCH', 'unknown');
-        let proc_list = status_array[3];   // stdout: multiline text
+        //console.log('svc_en: ' + data.svc_en.code + '  poll.running = ' + this.POLL.running);
-        let pkg_list  = status_array[4];   // stdout: installed packages
+        let svc_en = (data.svc_en.code == 0) ? true : false;
-        let stratlist = status_array[5];   // array of strat names
-        let sys_info  = status_array[6];   // stdout: openwrt distrib info
         
-        this.nfqws_strat_list = stratlist;
+        if (typeof(data.svc_info) !== 'object') {
-        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') {
             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) {
+        if (!data.pkg_dict) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+            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,66 @@ return view.extend({
         }
         let elem_status = elems.status || document.getElementById("status");
         elem_status.innerHTML = tools.makeStatusString(svcinfo, this.pkg_arch, '');
-        
+        this.POLL.running = false;
-        if (!poll.active()) {
-            poll.start();
-        }
     },
 
-    serviceAction: function(action, button) {
+    serviceActionEx: async function(action, button, args = [ ], hide_modal = false)
-        if (button) {
+    {
-            let elem = document.getElementById(button);
+        let btn = document.getElementById(button);
-            this.disableButtons(true, elem);
+        if (btn?.create_args) {
+            args = btn.create_args();
+            console.log('serviceActionEx: btn.args = '+JSON.stringify(args));
         }
-        poll.stop();
+        if (action == 'reset') {
-        
+            hide_modal = true;
-        let _this = this;
+        }
-        
+        await this.POLL.stopAndWait();
-        return tools.handleServiceAction(tools.appName, action)
+        this.disableButtons(true, btn);
-        .then(() => {
+        //console.log('serviceActionEx: poll.running = '+this.POLL.running);
-            return _this.getAppStatus().then(
+        try {
-                (status_array) => {
+            if (action == 'start' || action == 'restart') {
-                    _this.setAppStatus(status_array);
+                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) {
+        } catch(e) { 
-                return _this.getAppStatus().then(
+            //ui.addNotification(null, E('p', 'Error: ' + e.message));
-                    (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);
         }
-        poll.stop();
-        return fs.exec_direct(tools.execPath, [ action ]).then(res => {
-            return this.getAppStatus().then(
-                (status_array) => {
-                    this.setAppStatus(status_array);
-                    ui.hideModal();
-                }
-            );
-        });
     },
     
-    statusPoll: function() {
+    serviceActionExCallback: function(btn, result, error)
+    {
+        //console.log('serviceActionExCallback: poll.active = '+this.POLL.active);
+        this.POLL.start(150);
+    },
+
+    createServiceHandlerFn: function(action, btn_name)
+    {
+        let opt = { keepDisabled: true, callback: this.serviceActionExCallback };
+        return tools.createHandlerFnEx(this, 'serviceActionEx', opt, action, btn_name);
+    },
+
+    statusPoll: function()
+    {
         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', [
@@ -272,10 +231,11 @@ return view.extend({
         }, _('Cancel'));
 
         let resetcfg_btn = E('button', {
+            'id': 'resetcfg_btn',
+            'name': 'resetcfg_btn',
             'class': btn_style_action,
         }, _('Reset settings'));
-        resetcfg_btn.onclick = ui.createHandlerFn(this, () => {
+        resetcfg_btn.create_args = () => {
-            //cancel_button.disabled = true;
             let opt_flags = '';
             if (document.getElementById('cfg_reset_base').checked == false) {
                 opt_flags += '(skip_base)';
@@ -292,17 +252,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 [ opt_flags, opt_strat ];
-            return this.serviceActionEx('reset', resetcfg_btn, args, true);
+        };
-        });
+        resetcfg_btn.onclick = this.createServiceHandlerFn('reset', 'resetcfg_btn');
 
         ui.showModal(_('Reset settings to default'), [
             E('div', { 'class': 'cbi-section' }, [
@@ -327,24 +285,25 @@ return view.extend({
         ]);
     },
 
-    load: function() {
+    load: function()
-        var _this = this;
+    {
-        return Promise.all([
+        return tools.baseLoad(this, (data) => {
-            L.resolveDefault(fs.stat('/bin/cat'), null),
+            //console.log('SYS FEATURES: '+JSON.stringify(data.sys_feat));
-        ]).then(function(data) {
+            tools.load_feat_env();
-            return _this.getAppStatus();
+            return this.getAppStatus();
         });
     },
 
-    render: function(status_array) {
+    render: function(data)
-        if (!status_array) {
+    {
+        if (!data) {
             return;
         }
         let cfg = uci.get(tools.appName, 'config');
 
-        let pkg_list = status_array[4];
+        let pkgdict = data.pkg_dict;
-        if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
+        if (pkgdict == null) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
             return;
         }
 
@@ -390,17 +349,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'));
@@ -426,17 +385,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-zapret/htdocs/luci-static/resources/view/zapret/settings.js

@@ -13,43 +13,24 @@ document.head.appendChild(E('link', {
 }));
 
 return view.extend({
-    parsers: { },
+    svc_info: null,
 
-    appStatusCode: null,
+    load: function()
-
+    {
-    depends: function(elem, key, array, empty=true) {
+        return tools.baseLoad(this, (data) => {
-        if (empty && array.length === 0) {
+            //console.log('SYS FEATURES: '+JSON.stringify(data.sys_feat));
-            elem.depends(key, '_dummy');
+            tools.load_feat_env();
-        } else {
+            return data;
-            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) ));
         });
     },
 
-    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';
@@ -157,7 +175,14 @@ return view.extend({
             if (multiline == 2) {
                 desc += '<br/>' + _('Example') + ': <a target=_blank href=%s>%s</a>'.format(tools.nfqws_opt_url);
             }
-            btn.onclick = () => new tools.longstrEditDialog('config', param, param, desc, rows, multiline).show();
+            btn.onclick = () => new tools.longstrEditDialog({
+                cfgsec: 'config',
+                cfgparam: param,
+                title: param,
+                desc: desc,
+                rows: rows,
+                multiline: multiline,
+            }).show();
         };
 
         if (tools.appName == 'zapret2') {
@@ -313,13 +338,12 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.autoHostListFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.autoHostListFN,
+            file: tools.autoHostListFN,
-            _('Auto host list'),
+            title: _('Auto host list'),
-            '',
+            desc: '',
-            '',
+            rows: 15,
-            15
+        }).show();
-        ).show();
 
         o = s.taboption(tabname, form.Flag, 'AUTOHOSTLIST_DEBUGLOG', _('DEBUGLOG'));
         o.rmempty     = false;
@@ -329,13 +353,12 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.autoHostListDbgFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.autoHostListDbgFN,
+            file: tools.autoHostListDbgFN,
-            _('Auto host debug list'),
+            title: _('Auto host debug list'),
-            '',
+            desc: '',
-            '',
+            rows: 15,
-            15
+        }).show();
-        ).show();
         
         /* HostList settings */
 
@@ -346,37 +369,37 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsGoogleFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.hostsGoogleFN,
+            file: tools.hostsGoogleFN,
-            _('Google hostname entries'),
+            title: _('Google hostname entries'),
-            _('One hostname per line.<br />Examples:'),
+            desc: _('One hostname per line.<br />Examples:'),
-            '<code>youtube.com<br />googlevideo.com</code>',
+            aux: '<code>youtube.com<br />googlevideo.com</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries <HOSTLIST>'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.hostsUserFN,
+            file: tools.hostsUserFN,
-            _('User entries'),
+            title: _('User entries'),
-            _('One hostname per line.<br />Examples:'),
+            desc: _('One hostname per line.<br />Examples:'),
-            '<code>domain.net<br />sub.domain.com<br />facebook.com</code>',
+            aux: '<code>domain.net<br />sub.domain.com<br />facebook.com</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_excluded_entries_btn', _('User excluded hostname entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.hostsUserExcludeFN,
+            file: tools.hostsUserExcludeFN,
-            _('User excluded entries'),
+            title: _('User excluded entries'),
-            _('One hostname per line.<br />Examples:'),
+            desc: _('One hostname per line.<br />Examples:'),
-            '<code>domain.net<br />sub.domain.com<br />gosuslugi.ru</code>',
+            aux: '<code>domain.net<br />sub.domain.com<br />gosuslugi.ru</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
         
         add_delim(s);
 
@@ -384,37 +407,37 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.iplstExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.iplstExcludeFN,
+            file: tools.iplstExcludeFN,
-            _('Excluded IP filter'),
+            title: _('Excluded IP filter'),
-            _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
+            desc: _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
-            '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
+            aux: '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_ip_filter_btn', _('User IP entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.iplstUserFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.iplstUserFN,
+            file: tools.iplstUserFN,
-            _('User IP filter'),
+            title: _('User IP filter'),
-            _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
+            desc: _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
-            '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
+            aux: '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_excluded_ip_filter_btn', _('User excluded IP entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.iplstUserExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.iplstUserExcludeFN,
+            file: tools.iplstUserExcludeFN,
-            _('User excluded IP filter'),
+            title: _('User excluded IP filter'),
-            _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
+            desc: _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
-            '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
+            aux: '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
         
         add_delim(s);
         
@@ -425,7 +448,7 @@ return view.extend({
             o.inputtitle = _('Edit');
             o.inputstyle = 'edit btn';
             o.description = fn;
-            o.onclick = () => new tools.fileEditDialog(fn, name, '', '', 15).show();
+            o.onclick = () => new tools.fileEditDialog({ file: fn, title: name, rows: 15}).show();
         }
 
         /* custom.d files */
@@ -467,7 +490,7 @@ return view.extend({
                     desc += '<a target=_blank href=' + url + '>' + filename + '</a>';
                 }
             }
-            o.onclick = () => new tools.fileEditDialog(fn, name, desc, '', 15).show();
+            o.onclick = () => new tools.fileEditDialog({ file: fn, title: name, desc: desc, rows: 15}).show();
         }
 
         let map_promise = m.render();
@@ -475,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');
+            let apply_exec = tools.checkUnsavedChanges();
-            //if (this.appStatusCode != 1 && this.appStatusCode != 2) {
+            if (apply_exec) {
-            //    window.setTimeout(() => fs.exec(tools.execPath, [ 'restart' ]), 3000);
+                ui.changes.apply(mode == '0');
-            //}
+                tools.setDefferedAction('restart', this.svc_info);
+            } else {
+                if (this.svc_info?.dmn.inited) {
+                    tools.serviceActionEx('restart');
+                }
+            }
         });
     },
 });

luci-app-zapret/htdocs/luci-static/resources/view/zapret/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-zapret/htdocs/luci-static/resources/view/zapret/tools.js

@@ -42,6 +42,11 @@ return baseclass.extend({
         //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>',
     infoLabelStopped  : '<span class="label-status stopped">'  + _('Stopped')  + '</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) {
+                ver += '-r' + rev;
-                    // nothing
-                } else {
-                    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) {
+        let plist = proc_list;
-            return -2;
+        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;
+            }
         }
-        let plist = this.get_pid_list(proc_list.stdout);
+        if (svc_info == null) {
-        
+            return null;
-        if (plist.length < 4) {
-            return -3;
         }
         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');
@@ -320,14 +482,18 @@ return baseclass.extend({
     },
 
     fileEditDialog: baseclass.extend({
-        __init__: function(file, title, desc, aux = null, rows = 10, callback, file_exists = false) {
+        __init__: function(opts = {})
-            this.file        = file;
+        {
-            this.title       = title;
+            Object.assign(this, {
-            this.desc        = desc;
+                file: '',
-            this.aux         = aux;
+                title: '',
-            this.rows        = rows,
+                desc: '',
-            this.callback    = callback;
+                aux: '',
-            this.file_exists = file_exists;
+                rows: 10,
+                callback: null,
+                file_exists: false,
+                setperm: 644,
+            }, opts);
         },
 
         load: function() {
@@ -387,6 +553,12 @@ return baseclass.extend({
                         throw new Error('tee failed, rc = ' + res.code);
                     }
                 }
+                if (this.setperm) {
+                    let res = await fs.exec('/bin/busybox', [ 'chmod', '' + this.setperm, tmpFile ]);
+                    if (res.code != 0) {
+                        throw new Error('chmod failed, rc = ' + res.code);
+                    }
+                }
                 let res = await fs.exec('/bin/busybox', [ 'mv', '-f', tmpFile, fileName ]);
                 if (res.code != 0) {
                     throw new Error('mv failed, rc = ' + res.code);
@@ -455,13 +627,16 @@ return baseclass.extend({
     }),
 
     longstrEditDialog: baseclass.extend({
-        __init__: function(cfgsec, cfgparam, title, desc, rows = 10, multiline = false) {
+        __init__: function(opts = {})
-            this.cfgsec      = cfgsec;
+        {
-            this.cfgparam    = cfgparam;
+            Object.assign(this, {
-            this.title       = title;
+                cfgsec: '',
-            this.desc        = desc;
+                cfgparam: '',
-            this.rows        = rows;
+                title: '',
-            this.multiline   = multiline;
+                desc: '',
+                rows: 10,
+                multiline: false  // may be 2
+            }, opts);
             env_tools.load_env(this);
         },
 
@@ -525,8 +700,11 @@ return baseclass.extend({
                 if (value != "" && value != "\t") {
                     value = '\n' + value + '\n';
                     if (this.multiline == 2) {
+                        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 {
@@ -583,7 +761,7 @@ return baseclass.extend({
         },
     }),
 
-    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, cbarg = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
     {
         function appendLog(msg, end = '\n')
         {
@@ -607,69 +785,211 @@ return baseclass.extend({
             await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
             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');
         }
         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 + ')');
+                return callback.call(ctx, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
             }
             appendLog('Process started...');
         } 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 timerBusy = false;
+        return await new Promise(async (resolve, reject) => {
-        let timer = setInterval(async () => {
+            async function epoll()
-            if (timerBusy)
+            {
-                return;  // skip iteration
+                try {
-            timerBusy = true;
+                    let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
-            try {
+                    if (res.stdout && res.stdout.length > lastLen) {
-                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
+                        let log = res.stdout.slice(lastLen);
-                if (res.stdout && res.stdout.length > lastLen) {
+                        hide_rows.forEach(re => {
-                    let log = res.stdout.slice(lastLen);
+                            log = log.replace(re, '');
-                    hide_rows.forEach(re => {
+                        });                    
-                        log = log.replace(re, '');
+                        appendLog(log, '');
-                    });                    
+                        lastLen = res.stdout.length;
-                    appendLog(log, '');
+                    }
-                    lastLen = res.stdout.length;
+                    if (retCode < 0) {
-                }
+                        let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
-                if (retCode < 0) {
+                        if (rc.code != 0) {
-                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
+                            fixLogEnd();
-                    if (rc.code != 0) {
+                            resolve(callback.call(ctx, 545, 'ERROR: cannot read file "' + rcFile + '"'));
-                        clearInterval(timer);
+                            return;
+                        }
+                        if (rc.stdout) {
+                            retCode = parseInt(rc.stdout.trim(), 10);
+                        }
+                    }
+                    if (retCode >= 0) {
                         fixLogEnd();
-                        return callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"');
+                        if (retCode == 0 && res.stdout) {
+                            resolve(callback.call(ctx, 0, res.stdout));
+                            return;
+                        }
+                        resolve(callback.call(ctx, retCode, 'ERROR: Process failed with error ' + retCode));
+                        return;
                     }
-                    if (rc.stdout) {
+                    setTimeout(epoll, 500);
-                        retCode = parseInt(rc.stdout.trim(), 10);
+                } catch (e) {
+                    let skip_err = false;
+                    if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
+                        skip_err = true;
+                    }
+                    if (e.message?.includes('XHR request timed out')) {
+                        skip_err = true;
+                    }
+                    if (skip_err) {
+                        console.warn('WARN: execAndRead: ' + e.message);
+                        setTimeout(epoll, 500);
+                        return;  // goto next epoll iteration
                     }
-                }
-                if (retCode >= 0) {
-                    clearInterval(timer);
                     fixLogEnd();
-                    if (retCode == 0 && res.stdout) {
+                    let errtxt = 'ERROR: execAndRead: ' + e.message;
-                        return callback(cbarg, 0, res.stdout);
+                    errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
-                    }
+                    callback.call(ctx, 540, errtxt);
-                    return callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode);
+                    reject(e);
                 }
-            } catch (e) {
-                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
-                    console.warn('WARN: execAndRead: ' + e.message);
-                    return;  // goto next timer iteration
-                }
-                clearInterval(timer);
-                fixLogEnd();
-                let errtxt = 'ERROR: execAndRead: ' + e.message;
-                errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
-                return callback(cbarg, 540, errtxt);
-            } finally {
-                timerBusy = false;
             }
-        }, 500);
+            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-zapret/htdocs/luci-static/resources/view/zapret/updater.js

@@ -25,35 +25,28 @@ return baseclass.extend({
         this.logArea.scrollTop = this.logArea.scrollHeight;
     },
 
-    setBtnMode: function(enable)
+    setBtnMode: function(check, install, cancel)
     {
-        this.btn_cancel.disabled = enable ? false : true;
+        this.btn_check.disabled   = check   ? false : true;
-        this.btn_action.disabled = (enable == 2) ? false : true;
+        this.btn_install.disabled = install ? false : true;
+        this.btn_cancel.disabled  = cancel  ? false : true;
     },
     
     setStage: function(stage, btn_flag = true)
     {
-        if (stage == 0) {
+        if (stage == 0) this.setBtnMode(1, 0, 1);
-            this.btn_action.textContent = _('Check for updates');
+        if (stage == 1) this.setBtnMode(0, 0, 1);
-            this.btn_action.classList.remove('hidden');
+        if (stage == 2) this.setBtnMode(1, 1, 1);
-        } else
+        if (stage == 3) this.setBtnMode(0, 0, 0);
-        if (stage == 1) {
+        if (stage == 8) this.setBtnMode(0, 0, 1);
-            this.btn_action.textContent = _('Update packages');
+        if (stage >= 9) this.setBtnMode(0, 0, 0);
-            this.btn_action.classList.remove('hidden');
-        } else {
-            this.btn_action.classList.add('hidden');
-        }
-        if (stage > 1 && typeof(this.btn_action) == 'object') {
-            this.setBtnMode(1);
-        }
         this.stage = stage;
     },
 
-    checkUpdates: async function()
+    checkUpdates: async function(ev)
     {
         this._action = 'checkUpdates';
-        this.setStage(0);
+        this.setStage(1);
-        this.setBtnMode(0);
         this.pkg_url = null;
         this.appendLog(_('Checking for updates...'));
         let cmd = [ fn_update_pkg_sh, '-c' ];  // check for updates
@@ -61,82 +54,92 @@ return baseclass.extend({
             cmd.push('-p');  // include prereleases ZIP-files
         }
         this.forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
-        let log = '/tmp/'+tools.appName+'_pkg_check.log';
+        return tools.execAndRead({
-        let callback = this.execAndReadCallback;
+            cmd: cmd,
-        let wnd = this;
+            log: '/tmp/'+tools.appName+'_pkg_check.log',
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+            logArea: this.logArea,
+            callback: this.execAndReadCallback,
+            ctx: this,
+        });
     },
 
-    installUpdates: async function()
+    installUpdates: async function(ev)
     {
-        this._action = 'installUpdates';
-        this.setStage(1);
-        this.setBtnMode(0);
         if (!this.pkg_url || this.pkg_url.length < 10) {
             this.appendLog('ERROR: pkg_url = null');
-            this.setStage(999);
+            this.setStage(9);
             return;
         }
+        this._action = 'installUpdates';
+        this.setStage(3);
         this.appendLog(_('Install updates...'));
         let cmd = [ fn_update_pkg_sh, '-u', this.pkg_url ];  // update packages
         if (document.getElementById('cfg_forced_reinstall').checked == true) {
             cmd.push('-f');  // forced reinstall if same version
         }
         //this._test = 1; cmd.push('-t'); cmd.push('45');  // only for testing
-        let log = '/tmp/'+tools.appName+'_pkg_install.log';
+        return tools.execAndRead({
-        let hiderow = /^ \* resolve_conffiles.*(?:\r?\n|$)/gm;
+            cmd: cmd,
-        let callback = this.execAndReadCallback;
+            log: '/tmp/'+tools.appName+'_pkg_install.log',
-        let wnd = this;
+            logArea: this.logArea,
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, hiderow: hiderow, callback: callback, cbarg: wnd });
+            hiderow: /^ \* resolve_conffiles.*(?:\r?\n|$)/gm,
+            callback: this.execAndReadCallback,
+            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') {
+            if (this._action == 'checkUpdates') {
+                this.appendLog('=========================================================');
+                if (code && code[1] == 'E') {
+                    this.btn_install.textContent = _('Reinstall');
+                } else {
+                    this.btn_install.textContent = _('Install');
+                }
                 let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
                 if (code && pkg_url) {
-                    wnd.appendLog('=========================================================');
+                    if (!this.forced_reinstall) {
-                    wnd.pkg_url = pkg_url[1];
+                        if (code[1] == 'E' || code[1] == 'G') {
-                    code = code[1];
+                            this.setStage(0);  // install not needed
-                    if (code == 'E' && !wnd.forced_reinstall) {
+                            return;
-                        wnd.setStage(999);  // install not needed
+                        }
-                        return;
                     }
-                    wnd.setStage(1);
+                    this.pkg_url = pkg_url[1];
-                    wnd.setBtnMode(2);  // enable all buttons
+                    this.setStage(2);  // enable all buttons
                     return;  // install allowed
                 }
             }
-            if (wnd._action == 'installUpdates') {
+            if (this._action == 'installUpdates') {
-                if (wnd._test || (code && code[1] == '+')) {
+                if (this._test || (code && code[1] == '+')) {
-                    wnd.stage = 999;
+                    this.setStage(9);
-                    wnd.btn_action.textContent = _('OK');
+                    this.appendLog('Please update WEB-page (press F5)');
-                    wnd.btn_action.disabled = false;
-                    wnd.btn_cancel.disabled = true;
                     return;
                 }
             }
         }
+        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.setStage(999);
-        if (wnd._action == 'checkUpdates') {
-            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;
@@ -166,25 +169,30 @@ return baseclass.extend({
         }, _('Cancel'));
         this.btn_cancel.onclick = ui.hideModal;
 
-        this.btn_action = E('button', {
+        this.btn_check = E('button', {
-            'id': 'btn_action',
+            'id': 'btn_check',
-            'name': 'btn_action',
+            'name': 'btn_check',
             'class': btn_style_action,
-        }, 'BUTTON_ACTION');
+        }, _('Check'));
-        this.btn_action.onclick = ui.createHandlerFn(this, () => {
+        this.btn_check.onclick = ui.createHandlerFn(this, this.checkUpdates);
-            if (this.stage == 0) {
+
-                return this.checkUpdates();
+        this.btn_install = E('button', {
+            'id': 'btn_install',
+            'name': 'btn_install',
+            'class': btn_style_positive,
+        }, _('Install'));
+        this.btn_install.onclick = ui.createHandlerFn(this, async () => {
+            let res = await this.installUpdates();
+            if (true) {
+                setTimeout(() => {
+                    this.btn_install.disabled = true;
+                }, 0);
             }
-            if (this.stage == 1) {
-                return this.installUpdates();
-            }
-            return ui.hideModal();
         });
         
         this.setStage(0);
-        this.setBtnMode(2);
 
-        ui.showModal(_('Package update'), [
+        ui.showModal(_('Check for updates and install'), [
             E('div', { 'class': 'cbi-section' }, [
                 exclude_prereleases,
                 E('br'), E('br'),
@@ -194,9 +202,11 @@ return baseclass.extend({
                 this.logArea,
             ]),
             E('div', { 'class': 'right' }, [
-                this.btn_cancel,
+                this.btn_check,
                 ' ',
-                this.btn_action,
+                this.btn_install,
+                ' ',
+                this.btn_cancel,
             ])
         ]);
     }    

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20260116
+PKG_VERSION:=72.20260128
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c849e55ef0f1c244206f5a05ff7b1ab41a3824ee
+PKG_SOURCE_VERSION:=119e243b3664d6a512ed8b6ab61dcba00987105c
-PKG_SOURCE_DATE:=2026-01-16
+PKG_SOURCE_DATE:=2026-01-28
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
@@ -242,6 +242,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}"

zapret/comfunc.sh

@@ -170,17 +170,25 @@ function merge_cfg_with_def_values
 
 function remove_cron_task_logs
 {
-	if [ -f "$CRONTAB_FILE" ]; then
+	[ ! -f $CRONTAB_FILE ] && return 0
-		sed -i "/-name '$ZAPRET_CFG_NAME+\*.log' -size +/d" "$CRONTAB_FILE"
+	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"
+	local daemon_log_size_max=${1:-2000}
-	[ ! -f "$CRONTAB_FILE" ] && return 1
+	[ ! -f $CRONTAB_FILE ] && touch $CRONTAB_FILE
-	if ! grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size \+" "$CRONTAB_FILE"; then
+	[ ! -f $CRONTAB_FILE ] && return 1
-		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
+	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
+	if [ "$daemon_log_enable" = "1" ]; then
-		insert_cron_task_logs
+		insert_cron_task_logs "$daemon_log_size_max"
 	else
 		remove_cron_task_logs
 	fi

zapret/config.default

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

zapret/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/zapret+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log'
 		# autohostlist options
 		set $cfgname.config.AUTOHOSTLIST_RETRANS_THRESHOLD='3'
@@ -75,7 +76,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443 <HOSTLIST>
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -104,7 +105,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443 <HOSTLIST>
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -137,7 +138,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443 <HOSTLIST>
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -170,7 +171,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -211,7 +212,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -252,7 +253,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -297,7 +298,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -348,7 +349,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -384,7 +385,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt

zapret/dwc.sh

@@ -3,13 +3,15 @@
 
 ZAP_TMP_DIR=/tmp/zapret_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";;
@@ -25,7 +27,7 @@ TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
 [ -f "$TARGET_LIST_FILE" ] && exit 3
 
 CURL_TIMEOUT=5
-CURL_RANGETO=65535
+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'
@@ -67,7 +69,7 @@ fi
 #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='[
+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" },
@@ -76,7 +78,7 @@ TEST_SUITE='[
   { 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-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://nioges.com/libs/fontawesome/webfonts/fa-solid-900.woff2" },
   { 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" },
@@ -93,7 +95,38 @@ TEST_SUITE='[
   { 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" }
-]'
+'
+
+if [ "$opt_sites" = true ]; then
+	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
+	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
+	'
+	CURL_TIMEOUT=7
+fi
 
 function trim
 {
@@ -105,6 +138,17 @@ 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:*)
 			IDX=$((IDX + 1))
@@ -127,10 +171,31 @@ CURL_SPEED_LIMIT=1
 
 while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 	[ -z "$TAG" ] && continue
-	ID=$((ID+1))
 	ID3=$( printf '%03d' "$ID" )
-	COUNTRY=$( echo "$TAG" | cut -d. -f1 )
+	RANGETO=""
-	CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
+	REDIRECT=""
+	USERAGENT="$CURL_USERAGENT"
+	if [ "$opt_sites" = true ]; then
+		FLAGS="$PROVIDER"
+		TSIZE="$TIMES"
+		[ "$TSIZE" = "" ] && TSIZE=$CURL_MAXBODY
+		if echo "$FLAGS" | grep -q '@'; then
+			RANGETO=""
+		else
+			RANGETO="--range 0-$((TSIZE - 1))"
+		fi
+		PROVIDER="$TSIZE"
+		if echo "$FLAGS" | grep -q '#'; then
+			REDIRECT="-L"
+		fi
+		if echo "$FLAGS" | grep -q '+'; then
+			USERAGENT="curl/8.12"
+		fi
+	else
+		RANGETO="--range 0-$((CURL_MAXBODY - 1))"
+		COUNTRY=$( echo "$TAG" | cut -d. -f1 )
+		CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
+	fi
 	URL_NO_PROTO="${URL#*://}"
 	DOMAIN="${URL_NO_PROTO%%/*}"
 	URLPATH="/${URL_NO_PROTO#*/}"
@@ -157,12 +222,13 @@ while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 		echo "$URL" > "$FNAME.url"
 		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 \
+			$RANGETO \
-			-A "$CURL_USERAGENT" \
+			-A "$USERAGENT" \
 			-D "$FNAME.hdr" \
 			-o "$FNAME.body"
 	) > "$FNAME.log" 2>&1 &
@@ -181,6 +247,8 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	TAG=$( echo "$FILENAME" | cut -d= -f2)
 	PROVIDER=$(echo "$FILENAME" | cut -d= -f3 )
 	FNAME="$ZAP_TMP_DIR/$FILENAME"
+	REQ_SIZE=$CURL_MAXBODY
+	[ "$opt_sites" = true ] && REQ_SIZE="$PROVIDER"
 	BODY_SIZE=0
 	[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
 	IPADDR="x.x.x.x"
@@ -196,7 +264,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 $REQ_SIZE ]; then
 			status="Failed (recv $BODY_SIZE bytes)"
 			res=5
 		else
@@ -204,7 +272,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 +284,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
 

zapret/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 "$@"
 }

zapret/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
@@ -284,4 +285,42 @@ 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
 ####################################

zapret/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