Bump version to v72.20260126

luci: Restart service on press Save&Apply
luci: service: Rewrite func serviceActionEx
2026-01-27 12:50:35 +03:00 · 2026-01-26 22:06:36 +03:00 · 2026-01-26 22:05:22 +03:00 · 2026-01-26 16:07:05 +03:00 · 2026-01-26 12:59:34 +03:00 · 2026-01-25 10:01:09 +03:00
11 changed files with 490 additions and 280 deletions
--- a/luci-app-zapret/Makefile
+++ b/luci-app-zapret/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-zapret
-PKG_VERSION:=72.20260117
+PKG_VERSION:=72.20260126
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/diagnost.js
+++ b/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,19 +44,42 @@ return baseclass.extend({
            cmd.push(...[ '-d', dns_ip.trim() ]);
        }
        cmd.push('-R');  // show recommendations
-        let log = '/tmp/'+tools.appName+'_dwc.log';
-        let callback = this.execAndReadCallback;
-        let wnd = this;
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+        return tools.execAndRead({
+            cmd: cmd,
+            log: '/tmp/'+tools.appName+'_dwc.log',
+            logArea: this.logArea,
+            callback: this.execAndReadCallback,
+            cbarg: this,  // wnd
+        });
+    },
+
+    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,
+            cbarg: this,  // wnd
+        });
    },

    execAndReadCallback: function(wnd, rc, txt = '')
    {
+        wnd.setBtnMode(1, 1, 1);
        if (rc == 0 && txt) {
-            if (wnd._action == 'dpiCheck') {
-                wnd.appendLog('=========================================================');
-                return;
-            }
+            wnd.appendLog('=========================================================');
+            return;
        }
        if (rc >= 500) {
            if (txt) {
@@ -111,8 +142,15 @@ return baseclass.extend({
            'id': 'btn_dpicheck',
            'name': 'btn_dpicheck',
            'class': btn_style_action,
-        }, _('DPI check [tcp 16-20]'));
-        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
+        }, _('DPI check'));
+        this.btn_dpicheck.onclick = ui.createHandlerFn(this, this.dpiCheck);
+
+        this.btn_sitescheck = E('button', {
+            'id': 'btn_sitescheck',
+            'name': 'btn_sitescheck',
+            'class': btn_style_action,
+        }, _('Sites check'));
+        this.btn_sitescheck.onclick = ui.createHandlerFn(this, this.sitesCheck);
        
        ui.showModal(_('Diagnostics'), [
            E('div', { 'class': 'cbi-section' }, [
@@ -121,6 +159,8 @@ return baseclass.extend({
                this.logArea,
            ]),
            E('div', { 'class': 'right' }, [
+                this.btn_sitescheck,
+                ' ',
                this.btn_dpicheck,
                ' ',
                this.btn_cancel,
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
@@ -49,5 +49,7 @@ return baseclass.extend({
            dst_obj.packager.path = '/bin/opkg';
            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
        }
+        dst_obj.skey_pkg_dict = this.appName + '-pkg-dict';
+        dst_obj.skey_need_restart = this.appName + '-need-restart';
    }
 });
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
@@ -50,7 +50,7 @@ return view.extend({
            fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
            tools.getSvcInfo(),                     // svc_info
            fs.exec('/bin/busybox', [ 'ps' ]),      // process list
-            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
+            tools.getPackageDict(),                 // installed packages
            tools.getStratList(),                   // nfqws strategy list
            fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),  // CPU arch
            uci.load(tools.appName),              // config
@@ -73,9 +73,9 @@ return view.extend({
        }
        let svc_boot  = status_array[0] ? true : false;
        let svc_en    = status_array[1];   // stdout: empty or error text
-        let svc_info  = status_array[2];   // stdout: JSON as text
+        let svc_info  = status_array[2];   // dict for services
        let proc_list = status_array[3];   // stdout: multiline text
-        let pkg_list  = status_array[4];   // stdout: installed packages
+        let pkg_dict  = status_array[4];   // stdout: installed packages
        let stratlist = status_array[5];   // array of strat names
        let sys_info  = status_array[6];   // stdout: openwrt distrib info
        
@@ -95,8 +95,8 @@ return view.extend({
            this.disableButtons(true, -1, elems);
            return;
        }
-        if (pkg_list.code != 0) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+        if (!pkg_dict) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': getPackageDict()'));
            this.disableButtons(true, -1, elems);
            return;
        }
@@ -135,89 +135,27 @@ return view.extend({
        }
    },

-    serviceAction: function(action, button) {
-        if (button) {
-            let elem = document.getElementById(button);
-            this.disableButtons(true, elem);
-        }
+    serviceActionEx: async function(action, button, args = [ ], hide_modal = false, btn_dis = true)
+    {
+        let btn = document.getElementById(button);
+        this.disableButtons(true, btn);
        poll.stop();
-        
-        let _this = this;
-        
-        return tools.handleServiceAction(tools.appName, action)
-        .then(() => {
-            return _this.getAppStatus().then(
-                (status_array) => {
-                    _this.setAppStatus(status_array);
-                }
-            );
-        })
-        .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
-            }
+        try {
+            await tools.serviceActionEx(action, args, false);
            if (hide_modal) {
                ui.hideModal();
            }
-            if (!action) {
-                return _this.getAppStatus().then(
-                    (status_array) => {
-                        _this.setAppStatus(status_array);
-                    }
-                );
+        } 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();
            }
-            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() {
@@ -226,7 +164,12 @@ return view.extend({
        );
    },

-    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', [
@@ -274,7 +217,7 @@ return view.extend({
        let resetcfg_btn = E('button', {
            'class': btn_style_action,
        }, _('Reset settings'));
-        resetcfg_btn.onclick = ui.createHandlerFn(this, () => {
+        resetcfg_btn.onclick = ui.createHandlerFn(this, async () => {
            //cancel_button.disabled = true;
            let opt_flags = '';
            if (document.getElementById('cfg_reset_base').checked == false) {
@@ -342,9 +285,11 @@ return view.extend({
        }
        let cfg = uci.get(tools.appName, 'config');

-        let pkg_list = status_array[4];
-        if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+        tools.checkAndRestartSvc(status_array[2]);  // svc_info
+
+        let pkgdict = status_array[4];
+        if (pkgdict == null) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
            return;
        }

@@ -390,9 +335,9 @@ 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  = ui.createHandlerFn(this, this.serviceActionEx, '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 = ui.createHandlerFn(this, this.serviceActionEx, 'disable', 'btn_disable');
        layout_append(_('Service autorun control'), null, [ btn_enable, btn_disable ] );

        let btn_start       = create_btn('btn_start',   btn_style_action, _('Start'));
@@ -400,7 +345,7 @@ return view.extend({
        let btn_restart     = create_btn('btn_restart', btn_style_action, _('Restart'));
        btn_restart.onclick = ui.createHandlerFn(this, this.serviceActionEx, '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    = ui.createHandlerFn(this, this.serviceActionEx, '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'));
@@ -428,15 +373,15 @@ return view.extend({
        };
        this.setAppStatus(status_array, elems);

-        poll.add(L.bind(this.statusPoll, this));
+        poll.add(L.bind(this.statusPoll, this), 2);  // interval 2 sec

        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');
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js
@@ -13,43 +13,18 @@ document.head.appendChild(E('link', {
 }));

 return view.extend({
-    parsers: { },
-
-    appStatusCode: null,
-
-    depends: function(elem, key, array, empty=true) {
-        if (empty && array.length === 0) {
-            elem.depends(key, '_dummy');
-        } else {
-            array.forEach(e => elem.depends(key, e));
-        }
-    },
-
-    validateIpPort: function(section, value) {
-        return (/^$|^([0-9]{1,3}\.){3}[0-9]{1,3}(#[\d]{2,5})?$/.test(value)) ? true : _('Expecting:')
-            + ` ${_('One of the following:')}\n - ${_('valid IP address')}\n - ${_('valid address#port')}\n`;
-    },
-
-    validateUrl: function(section, value) {
-        return (/^$|^https?:\/\/[\w.-]+(:[0-9]{2,5})?[\w\/~.&?+=-]*$/.test(value)) ? true : _('Expecting:')
-            + ` ${_('valid URL')}\n`;
-    },
+    svc_info: null,

    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) ));
-        });
+        return tools.baseLoad();
    },

    render: function(data) {
        if (!data) {
            return;
        }
-        this.appStatusCode = data[0].code;
+        this.svc_info = data.svc_info;
+        tools.checkAndRestartSvc(this.svc_info);

        let m, s, o, tabname;

@@ -480,12 +455,14 @@ return view.extend({
        return map_promise;
    },

-    handleSaveApply: function(ev, mode) {
+    handleSaveApply: function(ev, mode)
+    {
        return this.handleSave(ev).then(() => {
            ui.changes.apply(mode == '0');
-            //if (this.appStatusCode != 1 && this.appStatusCode != 2) {
-            //    window.setTimeout(() => fs.exec(tools.execPath, [ 'restart' ]), 3000);
-            //}
+            if (this.svc_info?.dmn.inited) {
+                localStorage.setItem(tools.skey_need_restart, '1');
+                console.log('STOR KEY: '+tools.skey_need_restart+' = 1');
+            }
        });
    },
 });
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js
@@ -101,6 +101,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 +137,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 +147,100 @@ 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') {
+                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.');
+            }
+            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;
+            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));
+            }
+        }
+    },
+    
+    baseLoad: function(callback, cbarg)
+    {
+        return Promise.all([
+            this.getSvcInfo(),           // svc_info
+            uci.load(this.appName),
+        ])
+        .then( ([svcInfo, uci_data]) => {
+            let svc_info = this.decode_svc_info(true, svcInfo, [ ], null);
+            let ret = { svc_info, uci_data };
+            if (typeof callback === 'function') {
+                const res = callback(cbarg, ret);
+                if (res && typeof res.then === 'function') {
+                    return res.then(() => ret);
+                }
+                return ret;
+            }
+            return ret;
+        })
+        .catch(e => {
+            ui.addNotification(null, E('p', _('Unable to read the contents') + ' (baseLoad): %s '.format(e.message) ));
+            return null;
+        });
+    },
+
+    checkAndRestartSvc: function(svcInfo)
+    {
+        let svc_info = null;
+        if (svcInfo?.autorun !== undefined && svcInfo?.dmn !== undefined) {
+            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));
+        let need_restart = localStorage.getItem(this.skey_need_restart);
+        if (need_restart) {
+            localStorage.removeItem(this.skey_need_restart);
+            if (svcInfo?.dmn !== undefined && svc_info.dmn.inited) {
+                this.serviceActionEx('restart');
+            }
+        }
+    },
+    
+    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 +257,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 +296,7 @@ return baseclass.extend({
                }
            }
            if (rev >= 0) {
-                if (rev == 1 && !with_suffix_r1) {
-                    // nothing
-                } else {
-                    ver += '-r' + rev;
-                }
+                ver += '-r' + rev;
            }
            pkg_dict[name] = ver;
        }
@@ -219,13 +331,15 @@ return baseclass.extend({
            },
            "status": this.statusDict.error,
        };
-        if (proc_list.code != 0) {
-            return -2;
-        }        
-        let plist = this.get_pid_list(proc_list.stdout);
-        
-        if (plist.length < 4) {
-            return -3;
+        let plist = proc_list;
+        if (proc_list?.code !== undefined) {
+            if (proc_list.code != 0) {
+                return -2;
+            }        
+            plist = this.get_pid_list(proc_list.stdout);
+            if (plist.length < 4) {
+                return -3;
+            }
        }
        if (typeof(svc_info) !== 'object') {
            return -4;
@@ -392,7 +506,7 @@ return baseclass.extend({
                    }
                }
                if (this.setperm) {
-                    let res = await fs.exec('/bin/busybox', [ 'chmod', '644', tmpFile ]);
+                    let res = await fs.exec('/bin/busybox', [ 'chmod', '' + this.setperm, tmpFile ]);
                    if (res.code != 0) {
                        throw new Error('chmod failed, rc = ' + res.code);
                    }
@@ -639,54 +753,62 @@ return baseclass.extend({
        }
        let lastLen = 0;
        let retCode = -1;
-        let timerBusy = false;
-        let timer = setInterval(async () => {
-            if (timerBusy)
-                return;  // skip iteration
-            timerBusy = true;
-            try {
-                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
-                if (res.stdout && res.stdout.length > lastLen) {
-                    let log = res.stdout.slice(lastLen);
-                    hide_rows.forEach(re => {
-                        log = log.replace(re, '');
-                    });                    
-                    appendLog(log, '');
-                    lastLen = res.stdout.length;
-                }
-                if (retCode < 0) {
-                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
-                    if (rc.code != 0) {
-                        clearInterval(timer);
+        return await new Promise(async (resolve, reject) => {
+            async function poll()
+            {
+                try {
+                    let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
+                    if (res.stdout && res.stdout.length > lastLen) {
+                        let log = res.stdout.slice(lastLen);
+                        hide_rows.forEach(re => {
+                            log = log.replace(re, '');
+                        });                    
+                        appendLog(log, '');
+                        lastLen = res.stdout.length;
+                    }
+                    if (retCode < 0) {
+                        let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
+                        if (rc.code != 0) {
+                            fixLogEnd();
+                            resolve(callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"'));
+                            return;
+                        }
+                        if (rc.stdout) {
+                            retCode = parseInt(rc.stdout.trim(), 10);
+                        }
+                    }
+                    if (retCode >= 0) {
                        fixLogEnd();
-                        return callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"');
+                        if (retCode == 0 && res.stdout) {
+                            resolve(callback(cbarg, 0, res.stdout));
+                            return;
+                        }
+                        resolve(callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode));
+                        return;
                    }
-                    if (rc.stdout) {
-                        retCode = parseInt(rc.stdout.trim(), 10);
+                    setTimeout(poll, 500);
+                } 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(poll, 500);
+                        return;  // goto next poll iteration
                    }
-                }
-                if (retCode >= 0) {
-                    clearInterval(timer);
                    fixLogEnd();
-                    if (retCode == 0 && res.stdout) {
-                        return callback(cbarg, 0, res.stdout);
-                    }
-                    return callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode);
+                    let errtxt = 'ERROR: execAndRead: ' + e.message;
+                    errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
+                    callback(cbarg, 540, errtxt);
+                    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);
+            poll();
+        });
    },

 });
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/updater.js
+++ b/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_action.disabled = (enable == 2) ? false : true;
+        this.btn_check.disabled   = check   ? 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) {
-            this.btn_action.textContent = _('Check for updates');
-            this.btn_action.classList.remove('hidden');
-        } else
-        if (stage == 1) {
-            this.btn_action.textContent = _('Update packages');
-            this.btn_action.classList.remove('hidden');
-        } else {
-            this.btn_action.classList.add('hidden');
-        }
-        if (stage > 1 && typeof(this.btn_action) == 'object') {
-            this.setBtnMode(1);
-        }
+        if (stage == 0) this.setBtnMode(1, 0, 1);
+        if (stage == 1) this.setBtnMode(0, 0, 1);
+        if (stage == 2) this.setBtnMode(1, 1, 1);
+        if (stage == 3) this.setBtnMode(0, 0, 0);
+        if (stage == 8) this.setBtnMode(0, 0, 1);
+        if (stage >= 9) this.setBtnMode(0, 0, 0);
        this.stage = stage;
    },
-    
-    checkUpdates: async function()
+
+    checkUpdates: async function(ev)
    {
        this._action = 'checkUpdates';
-        this.setStage(0);
-        this.setBtnMode(0);
+        this.setStage(1);
        this.pkg_url = null;
        this.appendLog(_('Checking for updates...'));
        let cmd = [ fn_update_pkg_sh, '-c' ];  // check for updates
@@ -61,33 +54,38 @@ 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';
-        let callback = this.execAndReadCallback;
-        let wnd = this;
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+        return tools.execAndRead({
+            cmd: cmd,
+            log: '/tmp/'+tools.appName+'_pkg_check.log',
+            logArea: this.logArea,
+            callback: this.execAndReadCallback,
+            cbarg: this,  // wnd
+        });
    },

-    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';
-        let hiderow = /^ \* resolve_conffiles.*(?:\r?\n|$)/gm;
-        let callback = this.execAndReadCallback;
-        let wnd = this;
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, hiderow: hiderow, callback: callback, cbarg: wnd });
+        return tools.execAndRead({
+            cmd: cmd,
+            log: '/tmp/'+tools.appName+'_pkg_install.log',
+            logArea: this.logArea,
+            hiderow: /^ \* resolve_conffiles.*(?:\r?\n|$)/gm,
+            callback: this.execAndReadCallback,
+            cbarg: this,  // wnd
+        });
    },

    execAndReadCallback: function(wnd, rc, txt = '')
@@ -96,30 +94,34 @@ return baseclass.extend({
        if (rc == 0 && txt) {
            let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
            if (wnd._action == 'checkUpdates') {
+                wnd.appendLog('=========================================================');
+                if (code && code[1] == 'E') {
+                    wnd.btn_install.textContent = _('Reinstall');
+                } else {
+                    wnd.btn_install.textContent = _('Install');
+                }
                let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
                if (code && pkg_url) {
-                    wnd.appendLog('=========================================================');
-                    wnd.pkg_url = pkg_url[1];
-                    code = code[1];
-                    if (code == 'E' && !wnd.forced_reinstall) {
-                        wnd.setStage(999);  // install not needed
-                        return;
+                    if (!wnd.forced_reinstall) {
+                        if (code[1] == 'E' || code[1] == 'G') {
+                            wnd.setStage(0);  // install not needed
+                            return;
+                        }
                    }
-                    wnd.setStage(1);
-                    wnd.setBtnMode(2);  // enable all buttons
+                    wnd.pkg_url = pkg_url[1];
+                    wnd.setStage(2);  // enable all buttons
                    return;  // install allowed
                }
            }
            if (wnd._action == 'installUpdates') {
                if (wnd._test || (code && code[1] == '+')) {
-                    wnd.stage = 999;
-                    wnd.btn_action.textContent = _('OK');
-                    wnd.btn_action.disabled = false;
-                    wnd.btn_cancel.disabled = true;
+                    wnd.setStage(9);
+                    wnd.appendLog('Please update WEB-page (press F5)');
                    return;
                }
            }
        }
+        wnd.setStage(0);
        if (rc >= 500) {
            if (txt) {
                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
@@ -129,14 +131,15 @@ return baseclass.extend({
        } else {
            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
        }
-        wnd.setStage(999);
-        if (wnd._action == 'checkUpdates') {
-            wnd.appendLog('=========================================================');
-        }
+        wnd.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', {
-            'id': 'btn_action',
-            'name': 'btn_action',
+        this.btn_check = E('button', {
+            'id': 'btn_check',
+            'name': 'btn_check',
            'class': btn_style_action,
-        }, 'BUTTON_ACTION');
-        this.btn_action.onclick = ui.createHandlerFn(this, () => {
-            if (this.stage == 0) {
-                return this.checkUpdates();
+        }, _('Check'));
+        this.btn_check.onclick = ui.createHandlerFn(this, 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,
            ])
        ]);
    }    
--- a/zapret/Makefile
+++ b/zapret/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret
-PKG_VERSION:=72.20260117
+PKG_VERSION:=72.20260126
 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_DATE:=2026-01-17
+PKG_SOURCE_VERSION:=119e243b3664d6a512ed8b6ab61dcba00987105c
+PKG_SOURCE_DATE:=2026-01-26

 #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}"
--- a/zapret/comfunc.sh
+++ b/zapret/comfunc.sh
@@ -193,6 +193,9 @@ function init_before_start
 	[ ! -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
--- a/zapret/dwc.sh
+++ b/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 )
-	CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
+	RANGETO=""
+	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 \
-			-A "$CURL_USERAGENT" \
+			$RANGETO \
+			-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,21 +272,21 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 			res=100
 		fi
 	fi
-	if [ $res -lt 100 ] && [ -f "$FNAME.hdr" ] && [ $BODY_SIZE -eq 0 ]; then
-		if grep -q 'x-amzn-waf-action: challenge' "$FNAME.hdr"; then
-			status="WARN: tested site required JS-challenge"
-			res=999
-		fi
+	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
-	printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
 	echo "$BODY_SIZE" > "$FNAME.size"
-	if [ $res -lt 100 ]; then
+	if [ $res != 100 ]; then
 		URL=$( cat "$FNAME.url" )
 		echo "$FILENAME : $URL" >> "$FAIL_URL_LIST"
 	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

--- a/zapret/ipset/zapret-hosts-user-exclude.txt
+++ b/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
 ####################################
Author	SHA1	Message	Date
remittor	e0dbf3653d	Bump version to v72.20260126	2026-01-26 22:06:36 +03:00
remittor	df196ef9a9	luci: Restart service on press Save&Apply	2026-01-26 22:05:22 +03:00
remittor	c6dfbc5c7e	luci: service: Rewrite func serviceActionEx	2026-01-26 16:07:05 +03:00
remittor	436b4ed52e	luci: service: Add method getPackageDict	2026-01-26 12:59:34 +03:00
remittor	e16e4cb7f8	Bump version to v72.20260125	2026-01-25 10:01:09 +03:00
remittor	247f650b8a	makefile: Cleanup custom.d directory	2026-01-25 09:59:02 +03:00
remittor	d0c7bc694d	ipset: Update zapret-hosts-user-exclude.txt	2026-01-25 09:48:29 +03:00
remittor	999762b89c	Bump version to v72.20260119	2026-01-19 17:35:01 +03:00
remittor	8bb8293c6c	diag: Add sites check	2026-01-19 17:34:47 +03:00
remittor	11d7804ea2	ipset: Update zapret-hosts-user-exclude.txt	2026-01-19 16:54:43 +03:00
remittor	139134b324	luci: updater: Fix check result after checkUpdates	2026-01-18 14:23:21 +03:00
remittor	bcee335509	luci: updater: Using 3 buttons and fix execAndRead	2026-01-18 13:36:07 +03:00
remittor	25a1536601	luci: Fix error "XHR request timed out" into execAndRead	2026-01-18 10:00:55 +03:00