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.20260126
+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

@@ -49,7 +49,7 @@ return baseclass.extend({
             log: '/tmp/'+tools.appName+'_dwc.log',
             logArea: this.logArea,
             callback: this.execAndReadCallback,
-            cbarg: this,  // wnd
+            ctx: this,
         });
     },
 
@@ -70,27 +70,27 @@ return baseclass.extend({
             log: '/tmp/'+tools.appName+'_dwc.log',
             logArea: this.logArea,
             callback: this.execAndReadCallback,
-            cbarg: this,  // wnd
+            ctx: this,
         });
     },
 
-    execAndReadCallback: function(wnd, rc, txt = '')
+    execAndReadCallback: function(rc, txt = '')
     {
-        wnd.setBtnMode(1, 1, 1);
+        this.setBtnMode(1, 1, 1);
         if (rc == 0 && txt) {
-            wnd.appendLog('=========================================================');
+            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)

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,24 +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';
+        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')) {
-            dst_obj.packager.name = 'apk';
+            ctx.packager.name = 'apk';
-            dst_obj.packager.path = '/usr/bin/apk';
+            ctx.packager.path = '/usr/bin/apk';
-            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
+            ctx.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
         } else {
-            dst_obj.packager.name = 'opkg';
+            ctx.packager.name = 'opkg';
-            dst_obj.packager.path = '/bin/opkg';
+            ctx.packager.path = '/bin/opkg';
-            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
+            ctx.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
-        }
-        dst_obj.skey_pkg_dict = this.appName + '-pkg-dict';
-        dst_obj.skey_need_restart = this.appName + '-need-restart';
         }
+    },
 });

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

@@ -16,6 +16,8 @@ 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'),
@@ -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(),
-            tools.getPackageDict(),                 // 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,40 +65,34 @@ 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];   // dict for services
+        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_dict  = 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_dict) {
+        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,36 +126,55 @@ 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();
-        }
     },
 
-    serviceActionEx: async function(action, button, args = [ ], hide_modal = false, btn_dis = true)
+    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));
+        }
+        if (action == 'reset') {
+            hide_modal = true;
+        }
+        await this.POLL.stopAndWait();
         this.disableButtons(true, btn);
-        poll.stop();
+        //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;
+                }
+            }
             await tools.serviceActionEx(action, args, false);
             if (hide_modal) {
                 ui.hideModal();
             }
         } catch(e) { 
             //ui.addNotification(null, E('p', 'Error: ' + e.message));
-        } finally {
-            if (btn && btn_dis) {
-                setTimeout(() => { btn.disabled = true; }, 0);
-            }
-            if (!poll.active()) {
-                await new Promise(resolve => setTimeout(resolve, 10));
-                poll.start();
-            }
         }
     },
     
-    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)
         );
@@ -215,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, async () => {
+        resetcfg_btn.create_args = () => {
-            //cancel_button.disabled = true;
             let opt_flags = '';
             if (document.getElementById('cfg_reset_base').checked == false) {
                 opt_flags += '(skip_base)';
@@ -235,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' }, [
@@ -270,24 +285,23 @@ 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');
 
-        tools.checkAndRestartSvc(status_array[2]);  // svc_info
+        let pkgdict = data.pkg_dict;
-
-        let pkgdict = status_array[4];
         if (pkgdict == null) {
             ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
             return;
@@ -335,17 +349,17 @@ return view.extend({
         };
         
         let btn_enable      = create_btn('btn_enable',  btn_style_success, _('Enable'));
-        btn_enable.onclick  = ui.createHandlerFn(this, this.serviceActionEx, '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.serviceActionEx, '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.serviceActionEx, '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'));
@@ -371,9 +385,11 @@ 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), 2);  // interval 2 sec
+        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;
         page_title += ' &nbsp ';

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

@@ -15,16 +15,22 @@ document.head.appendChild(E('link', {
 return view.extend({
     svc_info: null,
 
-    load: function() {
+    load: function()
-        return tools.baseLoad();
+    {
+        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.svc_info = data.svc_info;
-        tools.checkAndRestartSvc(this.svc_info);
+        tools.execDefferedAction(this.svc_info);
 
         let m, s, o, tabname;
 
@@ -84,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';
@@ -458,10 +501,14 @@ return view.extend({
     handleSaveApply: function(ev, mode)
     {
         return this.handleSave(ev).then(() => {
+            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) {
-                localStorage.setItem(tools.skey_need_restart, '1');
+                    tools.serviceActionEx('restart');
-                console.log('STOR KEY: '+tools.skey_need_restart+' = 1');
+                }
             }
         });
     },

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>',
@@ -160,10 +165,6 @@ return baseclass.extend({
             let exec_cmd = null;
             let exec_arg = [ ];
             if (action == 'start' || action == 'restart') {
-                if (this.checkUnsavedChanges()) {
-                    await ui.changes.apply(true);
-                    await new Promise(resolve => setTimeout(resolve, 100));
-                }
                 exec_cmd = this.syncCfgPath;
                 errmsg = _('Unable to run sync_config.sh script.');
             }
@@ -180,7 +181,9 @@ return baseclass.extend({
                 }
             }
             errmsg = null;
+            if (action) {
                 await this.handleServiceAction(this.appName, action, throwed);
+            }
         } catch(e) { 
             if (throwed) {
                 throw e;
@@ -191,19 +194,34 @@ return baseclass.extend({
         }
     },
 
-    baseLoad: function(callback, cbarg)
+    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( ([svcInfo, uci_data]) => {
+        .then( ([ sys_feat, svcInfo, uci_data ]) => {
-            let svc_info = this.decode_svc_info(true, svcInfo, [ ], null);
+            let svc_info = this.decodeSvcInfo(svcInfo);
-            let ret = { svc_info, uci_data };
+            let ret = { sys_feat, svc_info, uci_data };
-            if (typeof callback === 'function') {
+            if (typeof(callback) === 'function') {
-                const res = callback(cbarg, ret);
+                const res = callback.call(ctx, ret);
-                if (res && typeof res.then === 'function') {
+                if (res && typeof(res.then) === 'function') {
-                    return res.then(() => ret);
+                    return res.then(() => res);
                 }
                 return ret;
             }
@@ -215,22 +233,48 @@ return baseclass.extend({
         });
     },
 
-    checkAndRestartSvc: function(svcInfo)
+    decodeSvcInfo: function(svc_info, svc_autorun = true, proc_list = [ ])
     {
-        let svc_info = null;
+        if (svc_info?.autorun !== undefined && svc_info?.dmn !== undefined) {
-        if (svcInfo?.autorun !== undefined && svcInfo?.dmn !== undefined) {
+            return svc_info;
-            svc_info = svcInfo;
-        } else
-        if (typeof(svcInfo) == 'object') {
-            svc_info = this.decode_svc_info(true, svcInfo, [ ], null);
         }
-        //console.log('checkAndRestartSvc: svc_info = '+JSON.stringify(svc_info));
+        if (svc_info != null && typeof(svc_info) == 'object') {
-        let need_restart = localStorage.getItem(this.skey_need_restart);
+            return this.decode_svc_info(svc_autorun, svc_info, proc_list);
-        if (need_restart) {
-            localStorage.removeItem(this.skey_need_restart);
-            if (svcInfo?.dmn !== undefined && svc_info.dmn.inited) {
-                this.serviceActionEx('restart');
         }
+        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);
         }
     },
     
@@ -320,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": {
@@ -341,6 +386,9 @@ return baseclass.extend({
                 return -3;
             }
         }
+        if (svc_info == null) {
+            return null;
+        }
         if (typeof(svc_info) !== 'object') {
             return -4;
         }
@@ -375,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');
@@ -652,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 {
@@ -714,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')
         {
@@ -738,23 +785,23 @@ 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;
         return await new Promise(async (resolve, reject) => {
-            async function poll()
+            async function epoll()
             {
                 try {
                     let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
@@ -770,7 +817,7 @@ return baseclass.extend({
                         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 + '"'));
+                            resolve(callback.call(ctx, 545, 'ERROR: cannot read file "' + rcFile + '"'));
                             return;
                         }
                         if (rc.stdout) {
@@ -780,13 +827,13 @@ return baseclass.extend({
                     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')) {
@@ -797,18 +844,152 @@ return baseclass.extend({
                     }
                     if (skip_err) {
                         console.warn('WARN: execAndRead: ' + e.message);
-                        setTimeout(poll, 500);
+                        setTimeout(epoll, 500);
-                        return;  // goto next poll iteration
+                        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-zapret/htdocs/luci-static/resources/view/zapret/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,54 +84,54 @@ 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') {
+            if (this._action == 'checkUpdates') {
-                wnd.appendLog('=========================================================');
+                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 (!wnd.forced_reinstall) {
+                    if (!this.forced_reinstall) {
                         if (code[1] == 'E' || code[1] == 'G') {
-                            wnd.setStage(0);  // install not needed
+                            this.setStage(0);  // install not needed
                             return;
                         }
                     }
-                    wnd.pkg_url = pkg_url[1];
+                    this.pkg_url = pkg_url[1];
-                    wnd.setStage(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.setStage(9);
+                    this.setStage(9);
-                    wnd.appendLog('Please update WEB-page (press F5)');
+                    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)

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20260126
+PKG_VERSION:=72.20260128
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=119e243b3664d6a512ed8b6ab61dcba00987105c
-PKG_SOURCE_DATE:=2026-01-26
+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?

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,7 +196,8 @@ 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
@@ -198,8 +207,8 @@ function init_before_start
 	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'

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