Bump version to v72.20260126

PR: ad6b23f4aa

.github/workflows/build.yml

@@ -276,6 +276,8 @@ jobs:
         run: |
           make defconfig
           sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
+          sed -i 's/CONFIG_LUCI_CSSMIN=y/CONFIG_LUCI_CSSMIN=n/g' .config
+          grep -q '^CONFIG_LUCI_CSSMIN=' .config || echo 'CONFIG_LUCI_CSSMIN=n' >> .config
           echo "status=success" >> $GITHUB_OUTPUT
 
       - name: Show config

.github/workflows/releases.yml

@@ -5,7 +5,7 @@ on:
     workflows: ["build"]
     types: [completed]
   release:
-    types: [published, created, edited]
+    types: [published, unpublished, created, edited, deleted, prereleased]
 
 permissions:
   contents: write
@@ -25,6 +25,62 @@ jobs:
           ref: gh-pages
         continue-on-error: true
 
+      - name: Wait for GitHub API consistency (release events)
+        if: github.event_name == 'release'
+        env:
+          REPO: ${{ github.repository }}
+          ACTION: ${{ github.event.action }}
+          TARGET_ID: ${{ github.event.release.id }}
+          TARGET_NAME: ${{ github.event.release.name }}
+        run: |
+          set -e
+          echo "Release action: $ACTION"
+          echo "Target release id: $TARGET_ID"
+          max=10
+          delay=6
+          check() {
+            curl -s https://api.github.com/repos/$REPO/releases
+          }
+          for iter in $(seq 1 $max); do
+            case "$ACTION" in
+              created)
+                echo "Release created (draft). No API wait needed."
+                exit 0
+                ;;
+              published|prereleased)
+                if check | jq "any(.[]; .id == $TARGET_ID)"; then
+                  echo "Release appeared in API"
+                  exit 0
+                fi
+                ;;
+              deleted)
+                if ! check | jq "any(.[]; .id == $TARGET_ID)"; then
+                  echo "Release disappeared from API"
+                  exit 0
+                fi
+                ;;
+              unpublished)
+                if check | jq "any(.[]; .id == $TARGET_ID and .draft == true)"; then
+                  echo "Release is now draft"
+                  exit 0
+                fi
+                ;;
+              edited)
+                if check | jq "any(.[]; .id == $TARGET_ID and .name == \"$TARGET_NAME\")"; then
+                  echo "Release updated"
+                  exit 0
+                fi
+                ;;
+              *)
+                echo "No consistency wait needed for action: $ACTION"
+                exit 0
+                ;;
+            esac
+            echo "Retry $iter/$max..."
+            sleep "$delay"
+          done
+          echo "WARNING: API consistency timeout for action $ACTION"
+    
       - name: Save FULL releases.json
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

luci-app-zapret/Makefile

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

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

@@ -5,7 +5,7 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';
 
 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -23,26 +23,63 @@ 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/');
         let cmd = [ fn_dwc_sh ];
-        let log = '/tmp/'+tools.appName+'_dwc.log';
+        let resolve_dns = document.getElementById('cfg_resolve_dns');
-        let callback = this.execAndReadCallback;
+        let dns_ip = resolve_dns.options[resolve_dns.selectedIndex].text;
-        let wnd = this;
+        if (dns_ip && dns_ip != 'default') {
-        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+            cmd.push(...[ '-d', dns_ip.trim() ]);
+        }
+        cmd.push('-R');  // show recommendations
+        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('=========================================================');
-                wnd.appendLog('=========================================================');
+            return;
-                return;
-            }
         }
         if (rc >= 500) {
             if (txt) {
@@ -53,7 +90,6 @@ return baseclass.extend({
         } else {
             wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
         }
-        wnd.setStage(999);
         wnd.appendLog('=========================================================');
     },
 
@@ -61,6 +97,32 @@ return baseclass.extend({
     {
         this.pkg_arch = pkg_arch;
 
+        let DNS_LIST = [
+            '8.8.8.8',          // Google
+            '8.8.4.4',          // Google
+            '1.1.1.1',          // Cloudflare
+            '1.0.0.1',          // Cloudflare
+            '9.9.9.9',          // Quad9
+            '149.112.112.112',  // Quad9
+            '208.67.222.222',   // OpenDNS
+            '208.67.220.220',   // OpenDNS
+            '8.26.56.26',       // Comodo
+            '8.20.247.20',      // Comodo
+            '64.6.64.6',        // Verisign
+            '64.6.65.6',        // Verisign
+        ];
+        let dns_list = [ ];
+        dns_list.push( E('option', { value: 'dns_default' }, [ 'default' ] ) );
+        for (let id = 0; id < DNS_LIST.length; id++) {
+            let dns_ipaddr = '' + DNS_LIST[id];
+            let val = 'dns_' + dns_ipaddr.replace(/\./g, "_");
+            dns_list.push( E('option', { value: val }, [ dns_ipaddr ] ));
+        } 
+        let resolve_dns = E('label', [
+            _('Resolve IP-Addr via') + ': ',
+            E('select', { id: 'cfg_resolve_dns' }, dns_list)
+        ]);
+ 
         this.logArea = E('textarea', {
             'id': 'widget.modal_content',
             'readonly': true,
@@ -80,14 +142,25 @@ return baseclass.extend({
             'id': 'btn_dpicheck',
             'name': 'btn_dpicheck',
             'class': btn_style_action,
-        }, _('DPI check [tcp 16-20]'));
+        }, _('DPI check'));
-        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
+        this.btn_dpicheck.onclick = ui.createHandlerFn(this, this.dpiCheck);
+
+        this.btn_sitescheck = E('button', {
+            'id': 'btn_sitescheck',
+            'name': 'btn_sitescheck',
+            'class': btn_style_action,
+        }, _('Sites check'));
+        this.btn_sitescheck.onclick = ui.createHandlerFn(this, this.sitesCheck);
         
         ui.showModal(_('Diagnostics'), [
             E('div', { 'class': 'cbi-section' }, [
+                resolve_dns,
+                E('br'), E('br'),
                 this.logArea,
             ]),
             E('div', { 'class': 'right' }, [
+                this.btn_sitescheck,
+                ' ',
                 this.btn_dpicheck,
                 ' ',
                 this.btn_cancel,

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';
     }
 });

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

@@ -18,14 +18,14 @@ const btn_style_success  = 'btn cbi-button-success important';
 return view.extend({
     get_svc_buttons: function(elems = { }) {
         return {
-            enable  : elems.btn_enable  || document.getElementById('btn_enable'),
+            "enable"  : elems.btn_enable  || document.getElementById('btn_enable'),
-            disable : elems.btn_disable || document.getElementById('btn_disable'),
+            "disable" : elems.btn_disable || document.getElementById('btn_disable'),
-            start   : elems.btn_start   || document.getElementById('btn_start'),
+            "start"   : elems.btn_start   || document.getElementById('btn_start'),
-            restart : elems.btn_restart || document.getElementById('btn_restart'),
+            "restart" : elems.btn_restart || document.getElementById('btn_restart'),
-            stop    : elems.btn_stop    || document.getElementById('btn_stop'),
+            "stop"    : elems.btn_stop    || document.getElementById('btn_stop'),
-            reset   : elems.btn_reset   || document.getElementById('btn_reset'),
+            "reset"   : elems.btn_reset   || document.getElementById('btn_reset'),
-            diag    : elems.btn_diag    || document.getElementById('btn_diag'),
+            "diag"    : elems.btn_diag    || document.getElementById('btn_diag'),
-            update  : elems.btn_update  || document.getElementById('btn_update'),
+            "update"  : elems.btn_update  || document.getElementById('btn_update'),
         };
     },
     
@@ -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) {
+        if (!pkg_dict) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': getPackageDict()'));
             this.disableButtons(true, -1, elems);
             return;
         }
@@ -135,89 +135,27 @@ return view.extend({
         }
     },
 
-    serviceAction: function(action, button) {
+    serviceActionEx: async function(action, button, args = [ ], hide_modal = false, btn_dis = true)
-        if (button) {
+    {
-            let elem = document.getElementById(button);
+        let btn = document.getElementById(button);
-            this.disableButtons(true, elem);
+        this.disableButtons(true, btn);
-        }
         poll.stop();
-        
+        try {
-        let _this = this;
+            await tools.serviceActionEx(action, args, false);
-        
-        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
-            }
             if (hide_modal) {
                 ui.hideModal();
             }
-            if (!action) {
+        } catch(e) { 
-                return _this.getAppStatus().then(
+            //ui.addNotification(null, E('p', 'Error: ' + e.message));
-                    (status_array) => {
+        } finally {
-                        _this.setAppStatus(status_array);
+            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', [
@@ -244,8 +187,18 @@ return view.extend({
             ' ', _('Set AutoHostList mode')
         ]);
 
+        let erase_autohostlist = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_erase_autohostlist' }),
+            ' ', _('Erase AutoHostList (ipset)')
+        ]);
+
+        let enable_custom_d = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_enable_custom_d' }),
+            ' ', _('Enable use  custom.d scripts')
+        ]);
+
         let strat_list = [ ];
-        strat_list.push( E('option', { value: 'strat__skip__' }, [ '-' ] ) );
+        strat_list.push( E('option', { value: 'strat__skip__' }, [ 'not change' ] ) );
         for (let id = 0; id < this.nfqws_strat_list.length; id++) {
             let strat = '' + this.nfqws_strat_list[id];
             strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
@@ -264,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) {
@@ -276,10 +229,19 @@ return view.extend({
             if (document.getElementById('cfg_autohostlist').checked) {
                 opt_flags += '(set_mode_autohostlist)';
             };
+            if (document.getElementById('cfg_erase_autohostlist').checked) {
+                opt_flags += '(erase_autohostlist)';
+            };
+            if (document.getElementById('cfg_enable_custom_d').checked) {
+                opt_flags += '(enable_custom_d)';
+            };
             //console.log('RESET: opt_flags = ' + opt_flags);
             let sel_strat = document.getElementById('cfg_nfqws_strat');
             let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
             //console.log('RESET: strat = ' + opt_strat);
+            if (opt_strat == 'not change') {
+                opt_strat = '-';
+            }
             opt_flags += '(sync)';
             let args = [ opt_flags, opt_strat ];
             return this.serviceActionEx('reset', resetcfg_btn, args, true);
@@ -293,6 +255,10 @@ return view.extend({
                 E('br'), E('br'),
                 set_autohostlist,
                 E('br'), E('br'),
+                erase_autohostlist,
+                E('br'), E('br'),
+                enable_custom_d,
+                E('br'), E('br'),
                 nfqws_strat,
                 E('br'), E('br')
             ]),
@@ -319,9 +285,11 @@ return view.extend({
         }
         let cfg = uci.get(tools.appName, 'config');
 
-        let pkg_list = status_array[4];
+        tools.checkAndRestartSvc(status_array[2]);  // svc_info
-        if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
+
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+        let pkgdict = status_array[4];
+        if (pkgdict == null) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
             return;
         }
 
@@ -367,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'));
@@ -377,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'));
@@ -386,7 +354,7 @@ return view.extend({
 
         let btn_diag        = create_btn('btn_diag',  btn_style_action, _('Diagnostics'));
         btn_diag.onclick    = ui.createHandlerFn(this, () => { diagnost.openDiagnostDialog(this.pkg_arch) });
-        layout_append('', null, [ btn_diag ] );
+        layout_append('Diagnostic tools', null, [ btn_diag ] );
 
         let btn_update      = create_btn('btn_update',  btn_style_action, _('Update'));
         btn_update.onclick  = ui.createHandlerFn(this, () => { updater.openUpdateDialog(this.pkg_arch) });
@@ -405,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');

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

@@ -7,44 +7,24 @@
 'require view';
 'require view.zapret.tools as tools';
 
+document.head.appendChild(E('link', {
+    rel: 'stylesheet',
+    href: L.resource('view/zapret/styles.css')
+}));
+
 return view.extend({
-    parsers: { },
+    svc_info: null,
-
-    appStatusCode: null,
-
-    depends: function(elem, key, array, empty=true) {
-        if (empty && array.length === 0) {
-            elem.depends(key, '_dummy');
-        } else {
-            array.forEach(e => elem.depends(key, e));
-        }
-    },
-
-    validateIpPort: function(section, value) {
-        return (/^$|^([0-9]{1,3}\.){3}[0-9]{1,3}(#[\d]{2,5})?$/.test(value)) ? true : _('Expecting:')
-            + ` ${_('One of the following:')}\n - ${_('valid IP address')}\n - ${_('valid address#port')}\n`;
-    },
-
-    validateUrl: function(section, value) {
-        return (/^$|^https?:\/\/[\w.-]+(:[0-9]{2,5})?[\w\/~.&?+=-]*$/.test(value)) ? true : _('Expecting:')
-            + ` ${_('valid URL')}\n`;
-    },
 
     load: function() {
-        return Promise.all([
+        return tools.baseLoad();
-            { code: -1}, // L.resolveDefault(fs.exec(tools.execPath, [ 'raw-status' ]), 1),
-            null, // L.resolveDefault(fs.list(tools.parsersDir), null),
-            uci.load(tools.appName),
-        ]).catch(e => {
-            ui.addNotification(null, E('p', _('Unable to read the contents') + ': %s '.format(e.message) ));
-        });
     },
 
     render: function(data) {
         if (!data) {
             return;
         }
-        this.appStatusCode = data[0].code;
+        this.svc_info = data.svc_info;
+        tools.checkAndRestartSvc(this.svc_info);
 
         let m, s, o, tabname;
 
@@ -128,8 +108,10 @@ return view.extend({
             let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname);
             btn.inputtitle = _('Edit');
             btn.inputstyle = 'edit btn';
-            let val = sec.taboption(tabname, form.DummyValue, '_' + param);
+            let val = sec.taboption(tabname, form.TextValue, '_' + param);
-            val.rawhtml = multiline ? true : false;
+            val.readonly = true;
+            val.rows = rows + 5;
+            val.wrap = false;
             val.cfgvalue = function(section_id) {
                 let value = uci.get(tools.appName, section_id, param);
                 if (value == null) {
@@ -141,21 +123,23 @@ return view.extend({
                     value = value.replace(/\n --/g, "\n--");
                     value = value.replace(/ --/g, "\n--");
                 }
-                if (val.rawhtml) {
-                    value = value.replace(/</g, '˂');
-                    value = value.replace(/>/g, '˃');
-                    value = value.replace(/\n/g, '<br/>');
-                }
                 return value;
             };
             val.validate = function(section_id, value) {
-                return (value) ? value.trim() : "";
+                return true;
             };
             let desc = locname;
             if (multiline == 2) {
                 desc += '<br/>' + _('Example') + ': <a target=_blank href=%s>%s</a>'.format(tools.nfqws_opt_url);
             }
-            btn.onclick = () => new tools.longstrEditDialog('config', param, param, desc, rows, multiline).show();
+            btn.onclick = () => new tools.longstrEditDialog({
+                cfgsec: 'config',
+                cfgparam: param,
+                title: param,
+                desc: desc,
+                rows: rows,
+                multiline: multiline,
+            }).show();
         };
 
         if (tools.appName == 'zapret2') {
@@ -279,6 +263,10 @@ return view.extend({
             o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_MAXSEQ', _('RETRANS_MAXSEQ'));
             o.rmempty     = false;
             o.datatype    = 'uinteger';
+
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_RESET', _('RETRANS_RESET'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
         }
         
         o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_THRESHOLD', _('RETRANS_THRESHOLD'));
@@ -307,13 +295,12 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.autoHostListFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.autoHostListFN,
+            file: tools.autoHostListFN,
-            _('Auto host list'),
+            title: _('Auto host list'),
-            '',
+            desc: '',
-            '',
+            rows: 15,
-            15
+        }).show();
-        ).show();
 
         o = s.taboption(tabname, form.Flag, 'AUTOHOSTLIST_DEBUGLOG', _('DEBUGLOG'));
         o.rmempty     = false;
@@ -323,13 +310,12 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.autoHostListDbgFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.autoHostListDbgFN,
+            file: tools.autoHostListDbgFN,
-            _('Auto host debug list'),
+            title: _('Auto host debug list'),
-            '',
+            desc: '',
-            '',
+            rows: 15,
-            15
+        }).show();
-        ).show();
         
         /* HostList settings */
 
@@ -340,37 +326,37 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsGoogleFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.hostsGoogleFN,
+            file: tools.hostsGoogleFN,
-            _('Google hostname entries'),
+            title: _('Google hostname entries'),
-            _('One hostname per line.<br />Examples:'),
+            desc: _('One hostname per line.<br />Examples:'),
-            '<code>youtube.com<br />googlevideo.com</code>',
+            aux: '<code>youtube.com<br />googlevideo.com</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries <HOSTLIST>'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.hostsUserFN,
+            file: tools.hostsUserFN,
-            _('User entries'),
+            title: _('User entries'),
-            _('One hostname per line.<br />Examples:'),
+            desc: _('One hostname per line.<br />Examples:'),
-            '<code>domain.net<br />sub.domain.com<br />facebook.com</code>',
+            aux: '<code>domain.net<br />sub.domain.com<br />facebook.com</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_excluded_entries_btn', _('User excluded hostname entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.hostsUserExcludeFN,
+            file: tools.hostsUserExcludeFN,
-            _('User excluded entries'),
+            title: _('User excluded entries'),
-            _('One hostname per line.<br />Examples:'),
+            desc: _('One hostname per line.<br />Examples:'),
-            '<code>domain.net<br />sub.domain.com<br />gosuslugi.ru</code>',
+            aux: '<code>domain.net<br />sub.domain.com<br />gosuslugi.ru</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
         
         add_delim(s);
 
@@ -378,37 +364,37 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.iplstExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.iplstExcludeFN,
+            file: tools.iplstExcludeFN,
-            _('Excluded IP filter'),
+            title: _('Excluded IP filter'),
-            _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
+            desc: _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
-            '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
+            aux: '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_ip_filter_btn', _('User IP entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.iplstUserFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.iplstUserFN,
+            file: tools.iplstUserFN,
-            _('User IP filter'),
+            title: _('User IP filter'),
-            _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
+            desc: _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
-            '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
+            aux: '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
 
         o = s.taboption(tabname, form.Button, '_user_excluded_ip_filter_btn', _('User excluded IP entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.iplstUserExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(
+        o.onclick = () => new tools.fileEditDialog({
-            tools.iplstUserExcludeFN,
+            file: tools.iplstUserExcludeFN,
-            _('User excluded IP filter'),
+            title: _('User excluded IP filter'),
-            _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
+            desc: _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
-            '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
+            aux: '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
-            15
+            rows: 15,
-        ).show();
+        }).show();
         
         add_delim(s);
         
@@ -419,7 +405,7 @@ return view.extend({
             o.inputtitle = _('Edit');
             o.inputstyle = 'edit btn';
             o.description = fn;
-            o.onclick = () => new tools.fileEditDialog(fn, name, '', '', 15).show();
+            o.onclick = () => new tools.fileEditDialog({ file: fn, title: name, rows: 15}).show();
         }
 
         /* custom.d files */
@@ -461,7 +447,7 @@ return view.extend({
                     desc += '<a target=_blank href=' + url + '>' + filename + '</a>';
                 }
             }
-            o.onclick = () => new tools.fileEditDialog(fn, name, desc, '', 15).show();
+            o.onclick = () => new tools.fileEditDialog({ file: fn, title: name, desc: desc, rows: 15}).show();
         }
 
         let map_promise = m.render();
@@ -469,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) {
+            if (this.svc_info?.dmn.inited) {
-            //    window.setTimeout(() => fs.exec(tools.execPath, [ 'restart' ]), 3000);
+                localStorage.setItem(tools.skey_need_restart, '1');
-            //}
+                console.log('STOR KEY: '+tools.skey_need_restart+' = 1');
+            }
         });
     },
 });

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

@@ -0,0 +1,6 @@
+textarea, .cbi-value textarea
+{
+    white-space: pre;
+    overflow-x: auto;
+    font-family: monospace;
+}

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) {
+                ver += '-r' + rev;
-                    // nothing
-                } else {
-                    ver += '-r' + rev;
-                }
             }
             pkg_dict[name] = ver;
         }
@@ -219,13 +331,15 @@ return baseclass.extend({
             },
             "status": this.statusDict.error,
         };
-        if (proc_list.code != 0) {
+        let plist = proc_list;
-            return -2;
+        if (proc_list?.code !== undefined) {
-        }        
+            if (proc_list.code != 0) {
-        let plist = this.get_pid_list(proc_list.stdout);
+                return -2;
-        
+            }        
-        if (plist.length < 4) {
+            plist = this.get_pid_list(proc_list.stdout);
-            return -3;
+            if (plist.length < 4) {
+                return -3;
+            }
         }
         if (typeof(svc_info) !== 'object') {
             return -4;
@@ -320,14 +434,18 @@ return baseclass.extend({
     },
 
     fileEditDialog: baseclass.extend({
-        __init__: function(file, title, desc, aux = null, rows = 10, callback, file_exists = false) {
+        __init__: function(opts = {})
-            this.file        = file;
+        {
-            this.title       = title;
+            Object.assign(this, {
-            this.desc        = desc;
+                file: '',
-            this.aux         = aux;
+                title: '',
-            this.rows        = rows,
+                desc: '',
-            this.callback    = callback;
+                aux: '',
-            this.file_exists = file_exists;
+                rows: 10,
+                callback: null,
+                file_exists: false,
+                setperm: 644,
+            }, opts);
         },
 
         load: function() {
@@ -370,11 +488,52 @@ return baseclass.extend({
             ]);
         },
 
-        handleSaveAdv: function(ev) {
+        writeAdv: async function(fileName, data, chunkSize = 8000)
-            let txt = document.getElementById('widget.modal_content');
+        {
-            let value = txt.value.trim().replace(/\r\n/g, '\n') + '\n';
+            let tmpFile = fileName + '.tmp';
+            try {
+                for (let wsize = 0; wsize <= data.length; wsize += chunkSize) {
+                    let chunk = data.slice(wsize, wsize + chunkSize);
+                    if (wsize > 0 && chunk.length == 0) {
+                        break;  // EOF
+                    }
+                    chunk = chunk.replace(/'/g, `'\"'\"'`);
+                    let teeArg = (wsize === 0) ? '' : '-a';
+                    let cmd = `printf %s '${chunk}' | tee ${teeArg} '${tmpFile}'`;
+                    let res = await fs.exec('/bin/busybox', [ 'sh', '-c', cmd ]);
+                    if (res.code !== 0) {
+                        throw new Error('tee failed, rc = ' + res.code);
+                    }
+                }
+                if (this.setperm) {
+                    let res = await fs.exec('/bin/busybox', [ 'chmod', '' + this.setperm, tmpFile ]);
+                    if (res.code != 0) {
+                        throw new Error('chmod failed, rc = ' + res.code);
+                    }
+                }
+                let res = await fs.exec('/bin/busybox', [ 'mv', '-f', tmpFile, fileName ]);
+                if (res.code != 0) {
+                    throw new Error('mv failed, rc = ' + res.code);
+                }
+            } catch(e) {
+                try {
+                    await fs.exec('/bin/busybox', [ 'rm', '-f', tmpFile ]);
+                } catch(e2) {
+                    // nothing
+                }
+                throw e;
+            }
+            return fs.stat(fileName);
+        },
 
-            return fs.write(this.file, value).then(async rc => {
+        handleSaveAdv: async function(ev)
+        {
+            let txt = document.getElementById('widget.modal_content');
+            let value = txt.value.trim().replace(/\r\n/g, '\n');
+            if (value.length > 0) {
+                value += '\n';
+            }
+            return this.writeAdv(this.file, value).then(async rc => {
                 txt.value = value;
                 ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
                 if (this.callback) {
@@ -420,13 +579,16 @@ return baseclass.extend({
     }),
 
     longstrEditDialog: baseclass.extend({
-        __init__: function(cfgsec, cfgparam, title, desc, rows = 10, multiline = false) {
+        __init__: function(opts = {})
-            this.cfgsec      = cfgsec;
+        {
-            this.cfgparam    = cfgparam;
+            Object.assign(this, {
-            this.title       = title;
+                cfgsec: '',
-            this.desc        = desc;
+                cfgparam: '',
-            this.rows        = rows;
+                title: '',
-            this.multiline   = multiline;
+                desc: '',
+                rows: 10,
+                multiline: false  // may be 2
+            }, opts);
             env_tools.load_env(this);
         },
 
@@ -490,6 +652,10 @@ return baseclass.extend({
                 if (value != "" && value != "\t") {
                     value = '\n' + value + '\n';
                     if (this.multiline == 2) {
+                        if (value.includes("'") || value.includes('"')) {
+                            alert(_('Unable to save the contents') + ':\n' + _('text cannot contain quotes!'));
+                            return false;
+                        }
                         value = value.replace(/"/g, '');
                         value = value.replace(/'/g, '');
                     }
@@ -506,24 +672,10 @@ return baseclass.extend({
             value = value.replace(/˂/g, '<');
             value = value.replace(/˃/g, '>');
             try {
-                let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam);
+                let elem = document.getElementById("widget.cbid." + this.appName + ".config._" + this.cfgparam);
-                if (elem) {
-                    if (elem.querySelector('div')) {
-                        elem = elem.querySelector('div');
-                    } else {
-                        elem = elem.querySelector('output');
-                    }
-                }
                 if (elem) {
                     let val = value.trim();
-                    if (this.multiline) {
+                    elem.textContent = val;
-                        val = val.replace(/</g, '˂');
-                        val = val.replace(/>/g, '˃');
-                        val = val.replace(/\n/g, '<br/>');
-                        elem.innerHTML = val;
-                    } else {
-                        elem.textContent = val;
-                    }
                 }
             } catch(e) {
                 console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);
@@ -601,54 +753,62 @@ return baseclass.extend({
         }
         let lastLen = 0;
         let retCode = -1;
-        let timerBusy = false;
+        return await new Promise(async (resolve, reject) => {
-        let timer = setInterval(async () => {
+            async function poll()
-            if (timerBusy)
+            {
-                return;  // skip iteration
+                try {
-            timerBusy = true;
+                    let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
-            try {
+                    if (res.stdout && res.stdout.length > lastLen) {
-                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
+                        let log = res.stdout.slice(lastLen);
-                if (res.stdout && res.stdout.length > lastLen) {
+                        hide_rows.forEach(re => {
-                    let log = res.stdout.slice(lastLen);
+                            log = log.replace(re, '');
-                    hide_rows.forEach(re => {
+                        });                    
-                        log = log.replace(re, '');
+                        appendLog(log, '');
-                    });                    
+                        lastLen = res.stdout.length;
-                    appendLog(log, '');
+                    }
-                    lastLen = res.stdout.length;
+                    if (retCode < 0) {
-                }
+                        let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
-                if (retCode < 0) {
+                        if (rc.code != 0) {
-                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
+                            fixLogEnd();
-                    if (rc.code != 0) {
+                            resolve(callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"'));
-                        clearInterval(timer);
+                            return;
+                        }
+                        if (rc.stdout) {
+                            retCode = parseInt(rc.stdout.trim(), 10);
+                        }
+                    }
+                    if (retCode >= 0) {
                         fixLogEnd();
-                        return callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"');
+                        if (retCode == 0 && res.stdout) {
+                            resolve(callback(cbarg, 0, res.stdout));
+                            return;
+                        }
+                        resolve(callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode));
+                        return;
                     }
-                    if (rc.stdout) {
+                    setTimeout(poll, 500);
-                        retCode = parseInt(rc.stdout.trim(), 10);
+                } catch (e) {
+                    let skip_err = false;
+                    if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
+                        skip_err = true;
+                    }
+                    if (e.message?.includes('XHR request timed out')) {
+                        skip_err = true;
+                    }
+                    if (skip_err) {
+                        console.warn('WARN: execAndRead: ' + e.message);
+                        setTimeout(poll, 500);
+                        return;  // goto next poll iteration
                     }
-                }
-                if (retCode >= 0) {
-                    clearInterval(timer);
                     fixLogEnd();
-                    if (retCode == 0 && res.stdout) {
+                    let errtxt = 'ERROR: execAndRead: ' + e.message;
-                        return callback(cbarg, 0, res.stdout);
+                    errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
-                    }
+                    callback(cbarg, 540, errtxt);
-                    return callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode);
+                    reject(e);
                 }
-            } catch (e) {
-                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
-                    console.warn('WARN: execAndRead: ' + e.message);
-                    return;  // goto next timer iteration
-                }
-                clearInterval(timer);
-                fixLogEnd();
-                let errtxt = 'ERROR: execAndRead: ' + e.message;
-                errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
-                return callback(cbarg, 540, errtxt);
-            } finally {
-                timerBusy = false;
             }
-        }, 500);
+            poll();
+        });
     },
 
 });

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

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

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20260111
+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:=a775aa7aaa4903a8c0870f9c16918e9d19d83772
+PKG_SOURCE_VERSION:=119e243b3664d6a512ed8b6ab61dcba00987105c
-PKG_SOURCE_DATE:=2026-01-11
+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?
@@ -56,91 +56,165 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
 endef
 
+ZAPRET_DIR := /opt/zapret
+
+define ZAPRET_CONFFILES_LIST
+$(ZAPRET_DIR)/config
+$(ZAPRET_DIR)/ipset/zapret-hosts-google.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-user.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-user-exclude.txt
+$(ZAPRET_DIR)/ipset/zapret-ip-exclude.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-auto.txt
+$(ZAPRET_DIR)/ipset/cust1.txt
+$(ZAPRET_DIR)/ipset/cust2.txt
+$(ZAPRET_DIR)/ipset/cust3.txt
+$(ZAPRET_DIR)/ipset/cust4.txt
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/10-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/20-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/50-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/60-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/90-script.sh
+endef
+
+$(eval ZAPRET_CONFFILES := $(foreach file,$(ZAPRET_CONFFILES_LIST),$(strip $(file))))
+
 define Package/$(PKG_NAME)/conffiles
-/etc/config/zapret
+$(ZAPRET_CONFFILES_LIST)
-/opt/zapret/config
-/opt/zapret/ipset/
-/opt/zapret/init.d/openwrt/custom.d/
 endef
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/opt/zapret
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)
-	$(INSTALL_DIR) $(1)/opt/zapret/$(MAKE_PATH)
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/$(MAKE_PATH)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)/opt/zapret/$(MAKE_PATH)/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/
-	$(INSTALL_DIR) $(1)/opt/zapret/ip2net
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ip2net
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret/ip2net/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)$(ZAPRET_DIR)/ip2net/
-	$(INSTALL_DIR) $(1)/opt/zapret/mdig
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/mdig
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)/opt/zapret/mdig/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)$(ZAPRET_DIR)/mdig/
-	$(INSTALL_DIR) $(1)/opt/zapret/common
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/common
-	$(CP) $(PKG_BUILD_DIR)/common/* $(1)/opt/zapret/common/
+	$(CP) $(PKG_BUILD_DIR)/common/* $(1)$(ZAPRET_DIR)/common/
-	#$(INSTALL_DIR) $(1)/opt/zapret/docs
+	#$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/docs
-	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)/opt/zapret/docs/
+	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)$(ZAPRET_DIR)/docs/
-	$(INSTALL_DIR) $(1)/opt/zapret/files
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/files
-	$(CP) $(PKG_BUILD_DIR)/files/* $(1)/opt/zapret/files/
+	$(CP) $(PKG_BUILD_DIR)/files/* $(1)$(ZAPRET_DIR)/files/
-	$(CP)                ./files/* $(1)/opt/zapret/files/
+	$(CP)                ./files/* $(1)$(ZAPRET_DIR)/files/
-	$(INSTALL_DIR) $(1)/opt/zapret/ipset
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset
-	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)/opt/zapret/ipset/
+	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)$(ZAPRET_DIR)/ipset/
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)/opt/zapret/blockcheck.sh
+	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)$(ZAPRET_DIR)/blockcheck.sh
-	#$(INSTALL_DATA) $(PKG_BUILD_DIR)/config.default $(1)/opt/zapret/config.default
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/tmp
-	$(INSTALL_DIR) $(1)/opt/zapret/tmp
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
+	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)$(ZAPRET_DIR)/init.d/openwrt/
-	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)/opt/zapret/init.d/openwrt/
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret $(1)/etc/hotplug.d/iface/90-zapret
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
-	$(INSTALL_DATA) ./config.default $(1)/opt/zapret/config.default
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset/zapret-hosts-google.txt
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset/zapret-hosts-user.txt
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret/ipset_def
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset_def/zapret-hosts-google.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset_def/zapret-hosts-user.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset_def/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset_def/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt/custom.d
-	$(CP) ./custom.d/* $(1)/opt/zapret/init.d/openwrt/custom.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
-	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/opt/zapret/uci-def-cfg.sh
+	# install all sh-scripts
-	$(INSTALL_BIN) ./comfunc.sh         $(1)/opt/zapret/comfunc.sh
+	$(CP) ./*.sh $(1)$(ZAPRET_DIR)/
-	$(INSTALL_BIN) ./def-cfg.sh         $(1)/opt/zapret/def-cfg.sh
+	rm -f $(1)$(ZAPRET_DIR)/init.d.sh
-	$(INSTALL_BIN) ./renew-cfg.sh       $(1)/opt/zapret/renew-cfg.sh
+	# Install conf files
-	$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret/restore-def-cfg.sh
+	$(foreach cfg,$(ZAPRET_CONFFILES), \
-	$(INSTALL_BIN) ./sync_config.sh     $(1)/opt/zapret/sync_config.sh
+		rel="$(cfg:$(ZAPRET_DIR)/%=%)"; \
-	$(INSTALL_BIN) ./script-exec.sh     $(1)/opt/zapret/script-exec.sh
+		src="./$$$$rel"; \
-	$(INSTALL_BIN) ./update-pkg.sh      $(1)/opt/zapret/update-pkg.sh
+		if echo "$$$$rel" | grep -q "/custom.d/"; then \
-	# Fix permisions
+			src="./custom.d/$$$$(basename $$$$rel)"; \
-	chmod 644 $(1)/opt/zapret/ipset/*.txt
+		fi; \
-	chmod 644 $(1)/opt/zapret/ipset_def/*.txt
+		dst="$(1)$(cfg)"; \
-	chmod 644 $(1)/opt/zapret/init.d/openwrt/custom.d/*.sh
+		mkdir -p "$(1)$(dir $(cfg))"; \
-	chmod 644 $(1)/opt/zapret/config.default
+		rm -f "$$$${dst}"; \
-	chmod 755 $(1)/opt/zapret/*.sh
+		if [ -f "$$$${src}" ]; then \
-	chmod 755 $(1)/opt/zapret/$(MAKE_PATH)/*
+			$(INSTALL_DATA) "$$$${src}" "$$$${dst}"; \
-	chmod 755 $(1)/opt/zapret/ip2net/*
+		else \
-	chmod 755 $(1)/opt/zapret/mdig/*
+			$(INSTALL_DATA) /dev/null "$$$${dst}"; \
+		fi; \
+	)
+	# Fix main config file
+	rm -f $(1)$(ZAPRET_DIR)/config
+	$(INSTALL_DATA) ./config.default $(1)$(ZAPRET_DIR)/config
+	$(INSTALL_DATA) ./config.default $(1)$(ZAPRET_DIR)/config.default
+	# Install def conf files
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset_def
+	$(CP) ./ipset/zapret*.txt  $(1)$(ZAPRET_DIR)/ipset_def/
+	# Fix permissions
+	chmod 644 $(1)$(ZAPRET_DIR)/ipset/*.txt
+	chmod 644 $(1)$(ZAPRET_DIR)/ipset_def/*.txt
+	chmod 644 $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d/*.sh
+	chmod 644 $(1)$(ZAPRET_DIR)/config*
+	chmod 755 $(1)$(ZAPRET_DIR)/*.sh
+	chmod 755 $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/*
+	chmod 755 $(1)$(ZAPRET_DIR)/ip2net/*
+	chmod 755 $(1)$(ZAPRET_DIR)/mdig/*
+	# Disable TPWS in blockcheck
+	grep -q '^SKIP_TPWS=' $(1)$(ZAPRET_DIR)/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)$(ZAPRET_DIR)/blockcheck.sh
 endef
 
 define Package/$(PKG_NAME)/preinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	if [ -f "/etc/init.d/zapret" ]; then
+	ZAPRET_DIR=/opt/zapret
-		SCRIPT=$$( readlink /etc/init.d/zapret )
+	ZAPRET_INITD=/etc/init.d/zapret
+	ZAPRET_CFG=/etc/config/zapret
+	if [ -f "$${ZAPRET_INITD}" ]; then
+		SCRIPT=$$( readlink "$${ZAPRET_INITD}" )
 		if [ -n "$${SCRIPT}" ]; then
-			echo "Please uninstall original zapret utility!"
+			echo "Please uninstall incompatible \"zapret\" service!"
 			exit 44
 		fi
 	fi
+	if command -v apk >/dev/null; then
+		PKG_MGR="apk"
+		PKG_CHECK="apk info -e "
+		PKG_REMOVE="apk del --force "
+	else
+		PKG_MGR="opkg"
+		PKG_CHECK="opkg status "
+		PKG_REMOVE="opkg remove --force-remove "
+	fi
 	if [ "$${PKG_UPGRADE}" = "1" ]; then
 		# stop service if PKG_UPGRADE
-		if [ -x "/etc/init.d/zapret" ]; then
+		if [ -x "$${ZAPRET_INITD}" ]; then
-			/etc/init.d/zapret running && /etc/init.d/zapret stop >/dev/null 2>&1
+			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
+	if $${PKG_CHECK} zapret >/dev/null 2>&1; then
+		if [ ! -f "/opt/zapret/sync_config.sh" ]; then
+			echo "Please uninstall incompatible \"zapret\" package!"
+			exit 47
+		fi
+		if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
+			echo "Please uninstall incompatible \"zapret\" package!"
+			exit 48
+		fi
+	fi
+	if $${PKG_CHECK} luci-app-zapret >/dev/null 2>&1; then
+		SVC_FILE=/www/luci-static/resources/view/zapret/service.js
+		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
+			echo "Please uninstall incompatible \"luci-app-zapret\" package!"
+			exit 55
+		fi
+	fi
+	if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
+		if [ -x "$${ZAPRET_INITD}" ]; then
+			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
+		fi
+		rm -f $${ZAPRET_CFG}
+		rm -f $${ZAPRET_INITD}
+		[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
+		echo "All files of the previously installed package have been removed!"
+	fi
+	if $${PKG_CHECK} zapret-mdig >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret-mdig
+	fi
+	if $${PKG_CHECK} zapret-ip2net >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret-ip2net
+	fi
+	if [ ! -d "$${ZAPRET_DIR}" ]; then
+		mkdir -p $${ZAPRET_DIR}
+	fi
 	if [ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ]; then
 		if [ -f "/opt/zapret/ipset/zapret-hosts-user.txt" ]; then
 			CFGLISTHASH=$$( md5sum "/opt/zapret/ipset/zapret-hosts-user.txt" | awk '{print $$1;}' )
@@ -157,8 +231,21 @@ define Package/$(PKG_NAME)/postinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
+	ZAPRET_DIR=/opt/zapret
+	ZAPRET_INITD=/etc/init.d/zapret
+	ZAPRET_CFG=/etc/config/zapret
 	ZAPRET_CONFIG=/opt/zapret/config
 	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	# Fix permissions
+	chmod 644 $${ZAPRET_CFG} >/dev/null 2>&1
+	chmod 644 $${ZAPRET_DIR}/ipset/*.txt >/dev/null 2>&1
+	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}"
@@ -171,8 +258,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Current file $${ZAPRET_CONFIG} backuped to $${ZAPRET_CONFIG_BACKUP}"
 		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	fi
+	# remove fake uci-config
+	[ -f "$${ZAPRET_CFG}" ] && [ ! -s "$${ZAPRET_CFG}" ] && rm -f "$${ZAPRET_CFG}"
 	# check existing uci-config
-	[ -f "/etc/config/zapret" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
+	[ -f "$${ZAPRET_CFG}" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
 	# create or merge uci-config
 	/opt/zapret/uci-def-cfg.sh
 	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret merged with default uci-config"
@@ -184,13 +273,13 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || exit 58
 	# enable main service
-	/etc/init.d/zapret enable
+	$${ZAPRET_INITD} enable
 	# stop all
-	/etc/init.d/zapret stop_fw
+	$${ZAPRET_INITD} stop_fw >/dev/null 2>&1
-	/etc/init.d/zapret stop_daemons
+	$${ZAPRET_INITD} stop_daemons >/dev/null 2>&1
 	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	# start main service
-	/etc/init.d/zapret start
+	$${ZAPRET_INITD} start
 	# restart firewall
 	[ -x /sbin/fw4 ] && fw4 -q restart || fw3 -q restart
 fi
@@ -201,8 +290,10 @@ define Package/$(PKG_NAME)/prerm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	EXEDIR=/opt/zapret
+	ZAPRET_DIR=/opt/zapret
 	ZAPRET_BASE=/opt/zapret
+	ZAPRET_INITD=/etc/init.d/zapret
+	ZAPRET_CFG=/etc/config/zapret
 	ZAPRET_CONFIG=/opt/zapret/config
 	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
 	OPENWRT_FW_INCLUDE=/etc/firewall.zapret
@@ -217,8 +308,8 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/fwtype.sh"
 	. "$${ZAPRET_BASE}/common/nft.sh"
 	. "$${ZAPRET_BASE}/common/installer.sh"
-	/etc/init.d/zapret running && /etc/init.d/zapret stop
+	$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
-	/etc/init.d/zapret disable
+	$${ZAPRET_INITD} disable >/dev/null 2>&1
 	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	remove_openwrt_firewall
 	nft_del_table
@@ -231,7 +322,9 @@ define Package/$(PKG_NAME)/postrm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	[ -f "/etc/config/zapret-opkg" ] && rm -f "/etc/config/zapret-opkg"
+	rm -f /etc/config/zapret-opkg*
+	rm -f /etc/config/zapret.opkg*
+	rm -f /etc/config/zapret.apk*
 	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
 	#rm -rf /opt/zapret
 	#echo "Directory /opt/zapret removed!"

zapret/comfunc.sh

@@ -130,7 +130,7 @@ function restore_all_ipset_cfg
 	restore_ipset_txt zapret-hosts-google.txt
 	restore_ipset_txt zapret-hosts-user.txt
 	restore_ipset_txt zapret-hosts-user-exclude.txt
-	restore_ipset_txt zapret-ip-exclude.txt.txt
+	restore_ipset_txt zapret-ip-exclude.txt
 }
 
 function create_default_cfg
@@ -179,7 +179,7 @@ function insert_cron_task_logs
 {
 	[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
 	[ ! -f "$CRONTAB_FILE" ] && return 1
-	if ! grep -q -e "-name '$ZAPRET_CFG_NAME\*\.log' -size \+" "$CRONTAB_FILE"; then
+	if ! grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size \+" "$CRONTAB_FILE"; then
 		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
 		/etc/init.d/cron restart 2> /dev/null
 	fi
@@ -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

zapret/def-cfg.sh

@@ -4,7 +4,7 @@
 function set_cfg_reset_values
 {
 	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
 	uci batch <<-EOF
 		set $cfgname.config.run_on_boot='0'
 		# settings for zapret service
@@ -47,7 +47,7 @@ function set_cfg_reset_values
 function clear_nfqws_strat
 {
 	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
 	uci batch <<-EOF
 		set $cfgname.config.MODE_FILTER='hostlist'
 		set $cfgname.config.NFQWS_PORTS_TCP='80,443'
@@ -61,7 +61,7 @@ function set_cfg_nfqws_strat
 {
 	local strat=${1:--}
 	local cfgname=${2:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
     
 	uci batch <<-EOF
 		set $cfgname.config.MODE_FILTER='hostlist'
@@ -75,7 +75,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443 <HOSTLIST>
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -104,7 +104,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443 <HOSTLIST>
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -137,7 +137,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443 <HOSTLIST>
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -170,7 +170,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -211,7 +211,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -252,7 +252,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -292,12 +292,63 @@ function set_cfg_nfqws_strat
 			commit $cfgname
 		EOF
 	fi
+	if [ "$strat" = "v7_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-pos=2,sld
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=ggpht.com
+				--dpi-desync-split-seqovl=620
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fooling=badsum,badseq
+
+				--new
+				--filter-tcp=443 <HOSTLIST>
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-seqovl=654
+				--dpi-desync-split-pos=1
+				--dpi-desync-fooling=ts
+				--dpi-desync-repeats=8
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/max.bin
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
+
+				--new
+				--filter-udp=443 <HOSTLIST_NOAUTO>
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+
+				--new
+				--filter-udp=19294-19344,50000-50100
+				--filter-l7=discord,stun
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+
+				--new
+				--filter-tcp=2053,2083,2087,2096,8443
+				--hostlist-domains=discord.media
+				--dpi-desync=multisplit
+				--dpi-desync-split-seqovl=652
+				--dpi-desync-split-pos=2
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
 	if [ "$strat" = "ALT7_by_Flowseal" ]; then
 		uci batch <<-EOF
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -333,7 +384,7 @@ function set_cfg_nfqws_strat
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
 			set $cfgname.config.NFQWS_PORTS_UDP='443'
 			set $cfgname.config.NFQWS_OPT="
-				# Strategy $strat
+				--comment=Strategy__$strat
 				
 				--filter-tcp=443
 				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
@@ -391,5 +442,17 @@ function set_cfg_default_values
 			commit $cfgname
 		EOF
 	fi
+	if echo "$opt_flags" | grep -q "(enable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='0'
+			commit $cfgname
+		EOF
+	fi
+	if echo "$opt_flags" | grep -q "(disable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='1'
+			commit $cfgname
+		EOF
+	fi
 	return 0
 }

zapret/dwc.sh

@@ -1,14 +1,36 @@
 #!/bin/sh
 # Copyright (c) 2026 remittor
 
-. /opt/zapret/comfunc.sh
-
 ZAP_TMP_DIR=/tmp/zapret_dwc
 
-rm -rf $ZAP_TMP_DIR
+opt_sites=
+opt_dig=
+opt_recom=
+opt_tmp_dir=
+opt_test=
+
+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";;
+		t) opt_test="true";;
+	esac
+done 
+
+[ "$opt_tmp_dir" != "" ] && ZAP_TMP_DIR="$opt_tmp_dir"
+
+TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
+
+[ -f "$TARGET_LIST_FILE" ] && rm -rf "$ZAP_TMP_DIR"
+[ -f "$TARGET_LIST_FILE" ] && exit 3
 
 CURL_TIMEOUT=5
-CURL_RANGETO=65535
+CURL_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'
 
 if ! command -v curl >/dev/null 2>&1; then
 	echo "ERROR: package \"curl\" not installed!"
@@ -24,10 +46,30 @@ if ! echo "$CURL_INFO" | grep -q 'https'; then
 	return 11
 fi
 
+if [ "$opt_dig" != "" ]; then
+	if ! command -v dig >/dev/null 2>&1; then
+		echo "ERROR: package \"bind-dig\" not installed!"
+		return 12
+	fi
+	OPT_DIG_DNS="@$opt_dig"
+	[ "$opt_dig" = "@"  ] && OPT_DIG_DNS=''
+	[ "$opt_dig" = "8"  ] && OPT_DIG_DNS='@8.8.8.8'
+	[ "$opt_dig" = "1"  ] && OPT_DIG_DNS='@1.1.1.1'
+	[ "$opt_dig" = "9"  ] && OPT_DIG_DNS='@9.9.9.9'
+fi
+
+if [ -f /etc/openwrt_release ]; then
+	CA_CERTS=/etc/ssl/certs/ca-certificates.crt
+	if [ ! -f $CA_CERTS ]; then
+		echo "ERROR: package \"ca-bundle\" not installed!"
+		return 15
+	fi
+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" },
@@ -36,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" },
@@ -45,7 +87,7 @@ TEST_SUITE='[
   { id: "DE.AWS-01", provider: "🇩🇪 AWS", times: 1, url: "https://www.getscope.com/assets/fonts/fa-solid-900.woff2" },
   { id: "US.AWS-01", provider: "🇺🇸 AWS", times: 1, url: "https://corp.kaltura.com/wp-content/cache/min/1/wp-content/themes/airfleet/dist/styles/theme.css" },
   { id: "US.GC-01", provider: "🇺🇸 Google Cloud", times: 1, url: "https://api.usercentrics.eu/gvl/v3/en.json" },
-  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/main.c7b61d59416f714f.js" },
+  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/footer/footer-element-es2015.js" },
   { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
   { id: "US.AKM-01", provider: "🇺🇸 Akamai", times: 1, url: "https://www.roxio.com/static/roxio/images/products/creator/nxt9/call-action-footer-bg.jpg" },
   { id: "PL.AKM-01", provider: "🇵🇱 Akamai", times: 1, url: "https://media-assets.stryker.com/is/image/stryker/gateway_1?$max_width_1410$" },
@@ -53,66 +95,214 @@ 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
 {
 	echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
 }
 
-mkdir -p $ZAP_TMP_DIR
+mkdir -p "$ZAP_TMP_DIR"
 
-ID=0
+: > "$TARGET_LIST_FILE"
-while IFS='|' read -r TAG PROVIDER TIMES URL; do
+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))
+			TAG=$( printf '%s\n' "$line" | cut -d'"' -f2 )
+			COUNTRY="${TAG%%.*}"
+			PROVIDER_RAW=$( printf '%s\n' "$line" | cut -d'"' -f4 )
+			PROVIDER="${PROVIDER_RAW#* }"
+			TIMES=$( printf '%s\n' "$line" | cut -d':' -f4 | cut -d',' -f1 | tr -d ' ')
+			URL=$( printf '%s\n' "$line" | cut -d'"' -f6 )
+			echo "${IDX}|${TAG}|${COUNTRY}|${PROVIDER}|${TIMES}|${URL}" >> "$TARGET_LIST_FILE"
+		;;
+	esac
+done <<EOF
+$TEST_SUITE
+EOF
+
+CURL_CON_TIMEOUT=$((CURL_TIMEOUT-2))
+CURL_SPEED_TIME=$((CURL_TIMEOUT-2))
+CURL_SPEED_LIMIT=1
+
+while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 	[ -z "$TAG" ] && continue
-	ID=$((ID+1))
+	ID3=$( printf '%03d' "$ID" )
-	ID3=$(printf '%03d' "$ID")
+	RANGETO=""
-	COUNTRY="$(echo "$TAG" | cut -d. -f1)"
+	REDIRECT=""
-	CNTFLAG="$(echo "$PROVIDER" | awk '{print $1}')"
+	USERAGENT="$CURL_USERAGENT"
-	PROVIDER="$(echo "$PROVIDER" | cut -d' ' -f2-)"
+	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#*/}"
 	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
-	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , TIMES=$TIMES , URL=$URL"
+	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
+	FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
 	(
-		DST_IP=$( curl -4 -s -o /dev/null -w '%{remote_ip}\n' $DOMAIN )
+		DST_IP=
-		if [ -z "$DST_IP" ]; then
+		RESOLVE_OPT=
-			DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
+		if [ "$opt_dig" != "" ]; then
+			DST_IP=$( dig +time=2 +retry=1 $OPT_DIG_DNS +short "$DOMAIN" 2>/dev/null | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
+		else
+			CURL_TIMEOUTS="--connect-timeout 2 --max-time 3 --speed-time 3 --speed-limit 1"
+			DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
+			if [ -z "$DST_IP" ]; then
+				DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
+			fi
 		fi
-		curl -k $URL --resolve $DOMAIN:443:$DST_IP -o /dev/null -s -w '%{size_download}\n' --max-time $CURL_TIMEOUT --range 0-$CURL_RANGETO
+		if [ "$DST_IP" = "" ]; then
-	) >"$ZAP_TMP_DIR/$ID3.$TAG.txt" 2>&1 &
+			DST_IP=$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p' )
-done <<EOF
+		fi
-$(printf '%s\n' "$TEST_SUITE" | sed -n '
+		[ "$DST_IP" != "" ] && RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
-s/.*id:[[:space:]]*"\([^"]*\)".*provider:[[:space:]]*"\([^"]*\)".*times:[[:space:]]*\([0-9]\+\).*url:[[:space:]]*"\([^"]*\)".*/\1|\2|\3|\4/p
+		echo "$DST_IP" > "$FNAME.ip"
-')
+		echo "$URL" > "$FNAME.url"
-EOF
+		curl "$URL" \
+			$RESOLVE_OPT \
+			$REDIRECT \
+			--connect-timeout $CURL_CON_TIMEOUT \
+			--max-time $CURL_TIMEOUT \
+			--speed-time $CURL_SPEED_TIME \
+			--speed-limit $CURL_SPEED_LIMIT	\
+			$RANGETO \
+			-A "$USERAGENT" \
+			-D "$FNAME.hdr" \
+			-o "$FNAME.body"
+	) > "$FNAME.log" 2>&1 &
+done < "$TARGET_LIST_FILE"
 
 wait
 
-for file in $(ls "$ZAP_TMP_DIR"/*.txt | sort); do
+FAIL_URL_LIST="$ZAP_TMP_DIR/FAIL_URL_LIST.txt"
+rm -f "$FAIL_URL_LIST"
+
+printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	[ -f "$file" ] || continue
-	tag="${file##*/}"
+	FILENAME="${file##*/}"
-	tag="${tag%.txt}"
+	FILENAME="${FILENAME%.log}"
-	tag="${tag#*.}"
+	ID=$( echo "$FILENAME" | cut -d= -f1)
-	res=$( cat "$file" )
+	TAG=$( echo "$FILENAME" | cut -d= -f2)
-	res=$( trim "$res" )
+	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"
+	[ -s "$FNAME.ip" ] && IPADDR=$( cat "$FNAME.ip" )
+	res=0
 	status=
-	case "$res" in
+	if [ ! -f "$FNAME.hdr" ]; then
-		''|*[!0-9]*)
+		status="ERROR: cannot Get Headers"
-			status="Error (incorrect value)"
+	elif [ ! -s "$FNAME.hdr" ]; then
-			;;
+		status="ERROR: cannot get headers"
-	esac
+	elif [ ! -f "$FNAME.body" ]; then
-	if [ -z "$status" ]; then
+		status="Possibly detected*"
-		if [ "$res" = 0 ]; then
+	elif [ ! -s "$FNAME.body" ]; then
-			status="Possibly detected"
+		status="Possibly detected"
-		elif [ "$res" -lt $CURL_RANGETO ]; then
+	else
-			status="Failed to complete detection"
+		if [ $BODY_SIZE -lt $REQ_SIZE ]; then
+			status="Failed (recv $BODY_SIZE bytes)"
+			res=5
 		else
 			status="[ OK ]"
+			res=100
 		fi
 	fi
-	printf '%12s: %s \n' "$tag" "$status"
+	if [ "$opt_sites" = true ]; then
+		printf '%18s / %-15s : %s \n' "$TAG" "$IPADDR" "$status"
+	else
+		printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
+	fi
+	echo "$BODY_SIZE" > "$FNAME.size"
+	if [ $res != 100 ]; then
+		URL=$( cat "$FNAME.url" )
+		echo "$FILENAME : $URL" >> "$FAIL_URL_LIST"
+	fi
 done
 
+if [ "$opt_test" != true ]; then
+	rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
+fi
+
+[ "$opt_recom" != "true" ] && return 0
+
+[ ! -f "$FAIL_URL_LIST" ] && return 0
+
+echo "==================================================="
+echo "Recommendations:"
+echo "Try adding the specified domains to the \"zapret-hosts-user.txt\" file:"
+
+while IFS=' : ' read -r FILENAME URL; do
+	[ -z "$FILENAME" ] && continue
+	URL_NO_PROTO="${URL#*://}"
+	DOMAIN="${URL_NO_PROTO%%/*}"
+	URLPATH="/${URL_NO_PROTO#*/}"
+	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
+	echo "$DOMAIN"
+done < "$FAIL_URL_LIST"
+
 return 0 

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

@@ -11,10 +11,14 @@ fe80::/10
 nalog.ru
 gstatic.com
 gosuslugi.ru
+mos.ru
 mos-gorsud.ru
 gov.ru
 sudrf.ru
+ottai.com
 ipstream.one
+vkusvill.ru
+kinopoisk.ru
 #################################### Epicgames
 easy.ac
 fab.com
@@ -36,45 +40,14 @@ cubicmotion.com
 playparagon.com
 realityscan.com
 epicgamescdn.com
-et.epicgames.com
-ol.epicgames.com
 radgametools.com
 unrealengine.com
-api.epicgames.dev
 easyanticheat.net
 shadowcomplex.com
 battlebreakers.com
-store.epicgames.com
 capturingreality.com
 unrealtournament.com
-cdn1.unrealengine.com
-cdn2.unrealengine.com
-accounts.epicgames.com
-download.epicgames.com
-tracking.epicgames.com
-download2.epicgames.com
-download3.epicgames.com
-download4.epicgames.com
-metrics.ol.epicgames.com
-datarouter.ol.epicgames.com
-fastly-download.epicgames.com
-store-content.ak.epicgames.com
-static-assets-prod.epicgames.com
 epicgames-download1.akamaized.net
-launcher-website-prod07.ol.epicgames.com
-ut-public-service-prod10.ol.epicgames.com
-store-site-backend-static.ak.epicgames.com
-library-service.live.use1a.on.epicgames.com
-accountportal-website-prod07.ol.epicgames.com
-account-public-service-prod03.ol.epicgames.com
-catalog-public-service-prod06.ol.epicgames.com
-friends-public-service-prod06.ol.epicgames.com
-launcher-public-service-prod06.ol.epicgames.com
-entitlement-public-service-prod08.ol.epicgames.com
-lightswitch-public-service-prod06.ol.epicgames.com
-orderprocessor-public-service-ecomprod01.ol.epicgames.com
-launcherwaitingroom-public-service-prod06.ol.epicgames.com
-datastorage-public-service-liveegs.live.use1a.on.epicgames.com
 #################################### Steam
 s.team
 steam.tv
@@ -102,99 +75,49 @@ valvesoftware.net
 steam.cdn.webra.ru
 steambroadcast.com
 steamcommunity.com
-cdn.steamstatic.com
-cs.steampowered.com
 dl.steam.clngaa.com
 steam.ru.qtlglb.com
-api.steampowered.com
 steam.eca.qtlglb.com
 steamusercontent.com
-help.steampowered.com
 steam.apac.qtlglb.com
 steam.naeu.qtlglb.com
 cdn.steamcommunity.com
 gstore.val.manlaxy.com
-login.steampowered.com
-media.steampowered.com
 partner.steamgames.com
-shared.steamstatic.com
 steam.cdn.orcon.net.nz
-store.steampowered.com
 steamcdn-a.akamaihd.net
 steampipe.akamaized.net
-partner.steampowered.com
 steamcdn-a.akamaized.net
 steamdeckusercontent.com
-support.steampowered.com
-checkout.steampowered.com
-community.steamstatic.com
 steam.cdn.slingshot.co.nz
 steammobile.akamaized.net
 steamstatic.akamaized.net
 steamstore-a.akamaihd.net
 steamvideo-a.akamaihd.net
-workshop.steampowered.com
-cdn.akamai.steamstatic.com
-cdn.fastly.steamstatic.com
 client-update.queniuqe.com
-community.steampowered.com
 steamdeckcdn.akamaized.net
 steampipe-kr.akamaized.net
-clan.fastly.steamstatic.com
 steamcontent-a.akamaihd.net
 steambroadcast.akamaized.net
 steamcommunity.akamaized.net
-store.akamai.steamstatic.com
-store.fastly.steamstatic.com
 scontent.steamusercontent.com
-shared.fastly.steamstatic.com
 steamcommunity-a.akamaihd.net
-avatars.fastly.steamstatic.com
-cdn.cloudflare.steamstatic.com
 edge.steam-dns.top.comcast.net
 steamcommunity-a.akamaized.net
 steamuserimages-a.akamaihd.net
 steampipe-partner.akamaized.net
 steamusercontent-a.akamaihd.net
-client-download.steampowered.com
-community.fastly.steamstatic.com
-store.cloudflare.steamstatic.com
-community.cloudflare.steamstatic.com
 steamcdn-a.akamaihd.net.edgesuite.net
 steamcloudsweden.blob.core.windows.net
-steamcommunity.cloudflare.steamstatic.com
 steamcommunity-a.akamaihd.net.edgesuite.net
 #################################### OpenWRT
-github.com
 openwrt.org
-gh.openwrt.org
-cdn.openwrt.org
-dev.openwrt.org
-git.openwrt.org
 lede-project.org
-wiki.openwrt.org
-forum.openwrt.org
-lists.openwrt.org
-openwrt.gitlab.io
-archive.openwrt.org
-downloads.openwrt.org
-fwdownloads.openwrt.org
-mirror-01.infra.openwrt.org
-mirror-02.infra.openwrt.org
-mirror-03.infra.openwrt.org
-mirror-04.infra.openwrt.org
 #################################### UbisoftConnect
 ubi.com
 ubisoft.com
-store.ubi.com
 ubisoftconnect.com
-connect.ubisoft.com
+connect.ubisoft.comubisoft-orbit-savegames.s3.amazonaws.com
-drops-register.ubi.com
-public-ubiservices.ubi.com
-ubisoftconnect.cdn.ubi.com
-uplaypc-s-ubisoft.cdn.ubi.com
-uplaypc-s-ubisoft-ww.cdn.ubi.com
-ubisoft-orbit-savegames.s3.amazonaws.com
 ubisoft-uplay-savegames.s3.amazonaws.com
 #################################### Aliexpress
 ae.com
@@ -214,43 +137,190 @@ playstation.net
 playstation.com
 account.sony.com
 psremoteplay.com
-ps4.playstation.com
-ps5.playstation.com
 playstationcloud.com
-psapi.playstation.net
-store.playstation.com
-media.playstation.com
-auth.np.ac.playstation.net
 sonyentertainmentnetwork.com
-np.community.playstation.net
-id.sonyentertainmentnetwork.com
 #################################### Twitch
 twitch.tv
 ttvnw.net
 jtvnw.net
-twimg.com
-m.twitch.tv
-id.twitch.tv
-www.twitch.tv
 twitchcdn.net
 ext-twitch.tv
 twitchsvc.net
-api.twitch.tv
-gql.twitch.tv
-dev.twitch.tv
 live-video.net
 twitch.a2z.com
-chat.twitch.tv
-help.twitch.tv
-assets.twitch.tv
 twitch-shadow.net
-passport.twitch.tv
-irc.chat.twitch.tv
-vod-metro.twitch.tv
 twitchcdn-shadow.net
-static.twitchcdn.net
+#################################### Valorant
-vod-secure.twitch.tv
+qq.com
-irc-ws.chat.twitch.tv
+pvp.net
-pubsub-edge.twitch.tv
+vivox.com
-vod-pop-secure.twitch.tv
+sd-rtn.com
+adjust.com
+riotcdn.net
+adobess.com
+valorant.com
+akamaihd.net
+myqcloud.com
+riotgames.com
+playvalorant.com
+wildrift-na.akamaized.net
+#################################### TikTok
+musical.ly
+tiktok.com
+tiktokv.eu
+tiktokv.us
+tiktokw.eu
+tiktokw.us
+muscdn.com
+tiktokd.net
+tiktokd.org
+tiktokv.com
+tiktokcdn.com
+ibytedtos.com
+ttwstatic.com
+tik-tokapi.com
+tiktok-row.net
+tiktokminis.us
+byteoversea.com
+tiktok-minis.com
+tiktokcdn-eu.com
+tiktokcdn-us.com
+tiktokeu-cdn.com
+tiktokrow-cdn.com
+tiktokglobalshopv.com
+tiktokcdn.com.akamaized.net
+tiktokcdn.com.edgesuite.net
+tiktokcdn-us.com.edgesuite.net
+#################################### Hoyoverse
+hoyo.link
+hoyolab.com
+yuanshen.com
+hoyoverse.com
+genshinimpact.com
+zenlesszonezero.com
+#################################### Xiaomi
+mi.com
+miui.com
+wali.com
+c.mi.com
+mgslb.com
+mifile.cn
+xiaomi.cn
+mipay.com
+youpin.cn
+zmifi.com
+mi-idc.com
+mi-img.com
+mijia.tech
+mitvos.com
+miwifi.com
+xiaomi.com
+xiaomi.net
+duokan.com
+saxyit.com
+mi-fan.com
+mihome.com
+xiaomisa.cn
+migames.com
+miaibox.com
+mi-home.com
+xiaomicp.com
+xiaomidns.cn
+xiaomiev.com
+xiaomiinc.cn
+xiaominr.com
+xiaomisa.com
+xiaomisa.net
+xiaomisa.org
+roborock.com
+mi-robot.com
+yeelight.com
+miot-spec.cn
+xiaomidns.com
+xiaomidns.net
+xiaomiinc.com
+xiaomiinc.net
+duokanbox.com
+youpin.com.cn
+miot-spec.org
+miot-spec.com
+xiaomiwear.com
+xiaomimimo.com
+dreamehome.com
+xiaomiprint.com
+xiaomidns.com.cn
+xiaomiinc.com.cn
+xiaomimobile.com
+xiaomixiaoai.com
+xiaomiyoupin.com
+xiaoaiassist.com
+xiaomi-mijia.com
+xiaomifactory.com
+airstarfinance.net
+dreame-technology.cn
+dreame-technology.com
+#################################### Picooc
+picoocru.com
+picooc-g.com
+picooc-int.com
+#################################### Huawei
+hc-cdn.cn
+huawei.ru
+huawei.com
+hc-cdn.com
+huawei.net
+dbankcdn.ru
+hicloud.com
+dbankcdn.com
+dbankcloud.ru
+dbankcloud.cn
+dbankcloud.com
+huaweicloud.com
+huaweistatic.com
+hwclouds-dns.com
+hwclouds-dns.net
+myhuaweicloud.cn
+myhuaweicloud.com
+huaweicloud-dns.cn
+huaweicloud-dns.ru
+huaweicloud-dns.com
+huaweicloud-dns.org
+#################################### Okko
+okko.tv
+playfamily.ru
+#################################### Beeline
+beeline.ru
+beeline.tv
+#################################### Delta Force
+volces.com
+wetest.net
+intlgame.com
+fleetlogd.com
+dgameglobal.com
+tdatamaster.com
+playdeltaforce.com
+quovadisglobal.com
+jupiterlauncher.com
+anticheatexpert.com
+#################################### Microsoft
+live.com
+lync.com
+skype.com
+microsoft
+msauth.net
+office.net
+office.com
+msocdn.com
+mojang.com
+windows.net
+msftauth.net
+xboxlive.com
+microsoft.com
+office365.com
+azureedge.net
+skypeassets.com
+windowsupdate.com
+microsoftonline.com
+microsoftonline-p.com
+minecraftservices.com
 ####################################

zapret/restore-def-cfg.sh

@@ -13,6 +13,11 @@ opt_strat=$2
 if echo "$opt_flags" | grep -q "(reset_ipset)"; then
 	restore_all_ipset_cfg
 fi
+
+if echo "$opt_flags" | grep -q "(erase_autohostlist)"; then
+	: > $ZAPRET_BASE/ipset/zapret-hosts-auto.txt
+	: > $ZAPRET_BASE/ipset/zapret-hosts-auto-debug.log
+fi
 	
 create_default_cfg "$opt_flags" "$opt_strat"
 

zapret/sync_config.sh

@@ -46,7 +46,7 @@ function sync_param
 	local value="$( uci -q get $ZAPRET_CFG_SEC.$param )"
 	uncomment_param $param
 	append_param $param
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
 	if [ "$value" = "$TAB" ]; then
 		value=""
 	fi
@@ -101,6 +101,7 @@ sync_param AUTOHOSTLIST_FAIL_TIME
 if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
 	sync_param AUTOHOSTLIST_INCOMING_MAXSEQ
 	sync_param AUTOHOSTLIST_RETRANS_MAXSEQ
+	sync_param AUTOHOSTLIST_RETRANS_RESET
 	sync_param AUTOHOSTLIST_UDP_IN
 	sync_param AUTOHOSTLIST_UDP_OUT
 fi

zapret/uci-def-cfg.sh

@@ -1,11 +1,15 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
+[ ! -f /opt/zapret/comfunc.sh ] && exit 0
+
 . /opt/zapret/comfunc.sh
 
+mkdir -p $ZAPRET_BASE/ipset
+
 # create empty txt files into ipset directory
 [ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-google.txt"     ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-google.txt"
-#[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"      ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"
+[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"       ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"
 [ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-user.txt"       ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
 [ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-user-ipban.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-user-ipban.txt"
 #[ ! -f "$ZAPRET_BASE/ipset/zapret-ip.txt"              ] && touch "$ZAPRET_BASE/ipset/zapret-ip.txt"
@@ -14,5 +18,6 @@
 [ ! -f "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt"    ] && touch "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt"
 
 # create or merge uci-config
+[ ! -f "$ZAPRET_BASE/renew-cfg.sh" ] && exit 0
 $ZAPRET_BASE/renew-cfg.sh
 	

zapret/update-pkg.sh

@@ -75,9 +75,13 @@ ZAP_PKG_URL=
 if command -v apk >/dev/null; then
 	PKG_MGR=apk
 	ZAP_PKG_EXT=apk
+	PKG_CHECK="apk info -e "
+	PKG_REMOVE="apk del --force "
 elif command -v opkg >/dev/null; then
 	PKG_MGR=opkg
 	ZAP_PKG_EXT=ipk
+	PKG_CHECK="opkg status "
+	PKG_REMOVE="opkg remove --force-remove "
 else
 	echo "ERROR: No package manager found"
 	return 1
@@ -487,7 +491,7 @@ if [ "$opt_update" != "" ]; then
 		fi
 	fi
 	if ! command -v unzip >/dev/null 2>&1; then
-		echo "ERROR: package \"upzip\" not installed!"
+		echo "ERROR: package \"unzip\" not installed!"
 		return 218
 	fi
 	unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
@@ -525,6 +529,14 @@ if [ "$opt_update" != "" ]; then
 	if [ "$opt_forced" = true ]; then
 		pkg_mgr_update
 	fi
+	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-mdig >/dev/null 2>&1; then
+		echo "Uninstall mdig..."
+		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-mdig
+	fi
+	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-ip2net >/dev/null 2>&1; then
+		echo "Uninstall ip2net..."
+		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-ip2net
+	fi
 	echo "Install downloaded packages..."
 	if [ "$PKG_MGR" != "apk" ]; then
 		opkg install --force-reinstall "$ZAP_PKG_BASE_FN"