Bump version to v0.8.20260113

makefile: Fix conffiles section and other fixes
shell: Fix sh-scripts (copilot)
2026-01-27 04:40:34 +03:00 · 2026-01-13 14:37:26 +03:00 · 2026-01-13 14:31:21 +03:00 · 2026-01-13 14:17:07 +03:00 · 2026-01-13 14:15:25 +03:00 · 2026-01-13 14:14:57 +03:00
18 changed files with 869 additions and 287 deletions
--- a/.github/workflows/releases.yml
+++ b/.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 }}
--- a/luci-app-zapret2/Makefile
+++ b/luci-app-zapret2/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-zapret2
-PKG_VERSION:=0.8.20260109
+PKG_VERSION:=0.8.20260113
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js
@@ -0,0 +1,96 @@
+'use strict';
+'require baseclass';
+'require fs';
+'require poll';
+'require uci';
+'require ui';
+'require view';
+'require view.zapret2.tools as tools';
+
+const btn_style_neutral  = 'btn';
+const btn_style_action   = 'btn cbi-button-action';
+const btn_style_positive = 'btn cbi-button-save important';
+const btn_style_negative = 'btn cbi-button-reset important';
+const btn_style_warning  = 'btn cbi-button-negative';
+const btn_style_success  = 'btn cbi-button-success important';
+
+const fn_dwc_sh   = '/opt/'+tools.appName+'/dwc.sh';
+
+return baseclass.extend({
+    appendLog: function(msg, end = '\n')
+    {
+        this.logArea.value += msg + end;
+        this.logArea.scrollTop = this.logArea.scrollHeight;
+    },
+
+    dpiCheck: async function()
+    {
+        this._action = 'dpiCheck';
+        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 callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+    },
+
+    execAndReadCallback: function(wnd, rc, txt = '')
+    {
+        if (rc == 0 && txt) {
+            if (wnd._action == 'dpiCheck') {
+                wnd.appendLog('=========================================================');
+                return;
+            }
+        }
+        if (rc >= 500) {
+            if (txt) {
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+            } else {
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
+            }
+        } else {
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
+        }
+        wnd.appendLog('=========================================================');
+    },
+
+    openDiagnostDialog: function(pkg_arch)
+    {
+        this.pkg_arch = pkg_arch;
+
+        this.logArea = E('textarea', {
+            'id': 'widget.modal_content',
+            'readonly': true,
+            'style': 'width:100% !important; font-family: monospace;',
+            'rows': 26,
+            'wrap': 'off',
+        });
+
+        this.btn_cancel = E('button', {
+            'id': 'btn_cancel',
+            'name': 'btn_cancel',
+            'class': btn_style_warning,
+        }, _('Cancel'));
+        this.btn_cancel.onclick = ui.hideModal;
+
+        this.btn_dpicheck = E('button', {
+            'id': 'btn_dpicheck',
+            'name': 'btn_dpicheck',
+            'class': btn_style_action,
+        }, _('DPI check [tcp 16-20]'));
+        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
+        
+        ui.showModal(_('Diagnostics'), [
+            E('div', { 'class': 'cbi-section' }, [
+                this.logArea,
+            ]),
+            E('div', { 'class': 'right' }, [
+                this.btn_dpicheck,
+                ' ',
+                this.btn_cancel,
+            ])
+        ]);
+    }    
+});
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/dmnlog.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/dmnlog.js
@@ -11,7 +11,7 @@ return view.extend({
    retrieveLog: async function() {
        return Promise.all([
            L.resolveDefault(fs.stat('/bin/cat'), null),
-            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', 'zapret2+*.log' ]),
+            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', tools.appName+'+*.log' ]),
            uci.load(tools.appName),
        ]).then(function(status_array) {
            var filereader = status_array[0] ? status_array[0].path : null;
@@ -64,7 +64,7 @@ return view.extend({
            }).catch(function(e) {
                ui.addNotification(null, E('p', _('Unable to execute or read contents')
                    + ': %s [ %s | %s | %s ]'.format(
-                        e.message, 'retrieveLogData', 'uci.zapret'
+                        e.message, 'retrieveLogData', 'uci.'+tools.appName
                )));
                return null;
            });
@@ -72,7 +72,7 @@ return view.extend({
            const [, lineno, colno] = e.stack.match(/(\d+):(\d+)/);
            ui.addNotification(null, E('p', _('Unable to execute or read contents')
                + ': %s [ lineno: %s | %s | %s | %s ]'.format(
-                    e.message, lineno, 'retrieveLog', 'uci.zapret'
+                    e.message, lineno, 'retrieveLog', 'uci.'+tools.appName
            )));
            return null;
        });
@@ -90,21 +90,21 @@ return view.extend({
                logdate_len = (Array.isArray(logdata)) ? logdata.length : -1;
            }
            let elem_name = elem.getAttribute("name");
-            let founded = false;
+            let found = false;
            if (logdate_len > 0) {
                for (let log_num = 0; log_num < logdate_len; log_num++) {
                    if (logdata[log_num].filename == elem_name) {
                        if (logdata[log_num].data) {
                            elem.value = logdata[log_num].data;
                            elem.rows  = logdata[log_num].rows;
-                            founded = true;
+                            found = true;
                            //console.log('POLL: updated ' + elem_name);
                        }
                        break;
                    }
                }
            }
-            if (!founded) {
+            if (!found) {
                elem.value = '';
                elem.rows  = 0;
            }
@@ -130,7 +130,7 @@ return view.extend({
            return;
        }
        var h2 = E('div', {'class' : 'cbi-title-section'}, [
-            E('h2', {'class': 'cbi-title-field'}, [ _('Zapret2') + ' - ' + _('Log Viewer') ]),
+            E('h2', {'class': 'cbi-title-field'}, [ tools.AppName + ' - ' + _('Log Viewer') ]),
        ]);

        var tabs = E('div', {}, E('div'));
@@ -140,7 +140,11 @@ return view.extend({
            var logfn = logdata[log_num].filename;
            let filename = logfn.replace(/.*\//, '');
            let fname = filename.split('.')[0];
-            fname = fname.replace(/^(zapret2\+)/, '');
+            if (tools.appName == 'zapret2') {
+                fname = fname.replace(/^(zapret2\+)/, '');
+            } else {
+                fname = fname.replace(/^(zapret\+)/, '');
+            }
            let fn = fname.split('+');
            
            let tabNameText = fname.replace(/\+/g, ' ');
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/env.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/env.js
@@ -0,0 +1,52 @@
+'use strict';
+'require baseclass';
+
+return baseclass.extend({
+    packager          : { },
+    appName           : 'zapret2',
+    AppName           : 'Zapret2',
+    execPath          : '/etc/init.d/zapret2',
+    appDir            : '/opt/zapret2',
+    syncCfgPath       : '/opt/zapret2/sync_config.sh',
+    defCfgPath        : '/opt/zapret2/def-cfg.sh',
+    defaultCfgPath    : '/opt/zapret2/restore-def-cfg.sh',
+
+    hostsGoogleFN     : '/opt/zapret2/ipset/zapret-hosts-google.txt',
+    hostsUserFN       : '/opt/zapret2/ipset/zapret-hosts-user.txt',
+    hostsUserExcludeFN: '/opt/zapret2/ipset/zapret-hosts-user-exclude.txt',
+    iplstExcludeFN    : '/opt/zapret2/ipset/zapret-ip-exclude.txt',
+    iplstUserFN       : '/opt/zapret2/ipset/zapret-ip-user.txt',
+    iplstUserExcludeFN: '/opt/zapret2/ipset/zapret-ip-user-exclude.txt',
+    custFileMax       : 4,
+    custFileTemplate  : '/opt/zapret2/ipset/cust%s.txt',
+    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
+    customdFileFormat : '/opt/zapret2/init.d/openwrt/custom.d/%s-script.sh',
+    discord_num       : 50,
+    discord_url       : [ 'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-discord-media',
+                          'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-stun4all',
+                          'https://github.com/bol-van/zapret2/tree/master/init.d/custom.d.examples.linux'
+                        ],
+    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/',
+
+    autoHostListFN    : '/opt/zapret2/ipset/zapret-hosts-auto.txt',
+    autoHostListDbgFN : '/opt/zapret2/ipset/zapret-hosts-auto-debug.log',
+
+    load_env: function(dst_obj) {
+        let env_proto = Object.getPrototypeOf(this);
+        Object.getOwnPropertyNames(env_proto).forEach(function(key) {
+            if (key === 'constructor' || key === 'load_env' || key.startsWith('__'))
+                return;
+            dst_obj[key] = env_proto[key];
+        });
+        dst_obj.packager = { };
+        if (L.hasSystemFeature('apk')) {
+            dst_obj.packager.name = 'apk';
+            dst_obj.packager.path = '/usr/bin/apk';
+            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
+        } else {
+            dst_obj.packager.name = 'opkg';
+            dst_obj.packager.path = '/bin/opkg';
+            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
+        }
+    }
+});
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/service.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/service.js
@@ -5,6 +5,7 @@
 'require ui';
 'require view';
 'require view.zapret2.tools as tools';
+'require view.zapret2.diagnost as diagnost';
 'require view.zapret2.updater as updater';

 const btn_style_neutral  = 'btn';
@@ -23,6 +24,7 @@ return view.extend({
            restart : elems.btn_restart || document.getElementById('btn_restart'),
            stop    : elems.btn_stop    || document.getElementById('btn_stop'),
            reset   : elems.btn_reset   || document.getElementById('btn_reset'),
+            diag    : elems.btn_diag    || document.getElementById('btn_diag'),
            update  : elems.btn_update  || document.getElementById('btn_update'),
        };
    },
@@ -55,7 +57,7 @@ return view.extend({
        ]).catch(e => {
            ui.addNotification(null, E('p', _('Unable to execute or read contents')
                + ': %s [ %s | %s | %s ]'.format(
-                    e.message, tools.execPath, 'tools.getInitState', 'uci.zapret2'
+                    e.message, tools.execPath, 'tools.getInitState', 'uci.'+tools.appName
            )));
        });
    },
@@ -248,9 +250,10 @@ return view.extend({
            let strat = '' + this.nfqws_strat_list[id];
            strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
        }
+        let label_nfqws = (tools.appName == 'zapret2') ? _('NFQWS2_OPT strategy: ') : _('NFQWS_OPT strategy: ');
        let nfqws_strat = E('label', [
-            _('NFQWS2_OPT strategy: '),
-            E('select', { id: 'cfg_nfqws2_strat' }, strat_list)
+            label_nfqws,
+            E('select', { id: 'cfg_nfqws_strat' }, strat_list)
        ]);

        let cancel_button = E('button', {
@@ -274,7 +277,7 @@ return view.extend({
                opt_flags += '(set_mode_autohostlist)';
            };
            //console.log('RESET: opt_flags = ' + opt_flags);
-            let sel_strat = document.getElementById('cfg_nfqws2_strat');
+            let sel_strat = document.getElementById('cfg_nfqws_strat');
            let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
            //console.log('RESET: strat = ' + opt_strat);
            opt_flags += '(sync)';
@@ -381,6 +384,10 @@ return view.extend({
        btn_reset.onclick   = L.bind(this.dialogResetCfg, this);
        layout_append(_('Reset settings to default'), null, [ btn_reset ] );

+        let btn_diag        = create_btn('btn_diag',  btn_style_action, _('Diagnostics'));
+        btn_diag.onclick    = ui.createHandlerFn(this, () => { diagnost.openDiagnostDialog(this.pkg_arch) });
+        layout_append('Diagnostic tools', null, [ btn_diag ] );
+
        let btn_update      = create_btn('btn_update',  btn_style_action, _('Update'));
        btn_update.onclick  = ui.createHandlerFn(this, () => { updater.openUpdateDialog(this.pkg_arch) });
        layout_append(_('Update package'), null, [ btn_update ] );
@@ -393,29 +400,30 @@ return view.extend({
            "btn_restart": btn_restart,
            "btn_stop": btn_stop,
            "btn_reset": btn_reset,
+            "btn_diag": btn_diag,
            "btn_update": btn_update,
        };
        this.setAppStatus(status_array, elems);

        poll.add(L.bind(this.statusPoll, this));

-        let page_title = _('Zapret2');
+        let page_title = tools.AppName;
        let pkgdict = tools.decode_pkg_list(pkg_list.stdout, false);
        page_title += ' &nbsp ';
-        if (pkgdict['zapret2'] === undefined || pkgdict['zapret2'] == '') {
+        if (pkgdict[tools.appName] === undefined || pkgdict[tools.appName] == '') {
            page_title += 'unknown version';
        } else {
-            page_title += 'v' + pkgdict['zapret2'];
+            page_title += 'v' + pkgdict[tools.appName];
        }
        let aux1 = E('em');
        let aux2 = E('em');
-        if (pkgdict['zapret2'] != pkgdict['luci-app-zapret2']) {
-            let errtxt = 'LuCI APP v' + pkgdict['luci-app-zapret2'] + ' [ incorrect version! ]';
+        if (pkgdict[tools.appName] != pkgdict['luci-app-'+tools.appName]) {
+            let errtxt = 'LuCI APP v' + pkgdict['luci-app-'+tools.appName] + ' [ incorrect version! ]';
            aux1 = E('div', { 'class': 'label-status error' }, errtxt);
            aux2 = E('div', { }, '&nbsp');
        }
        
-        let url1 = 'https://github.com/bol-van/zapret2';
+        let url1 = 'https://github.com/bol-van/'+tools.appName;
        let url2 = 'https://github.com/remittor/zapret-openwrt';

        return E([
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/settings.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/settings.js
@@ -48,7 +48,7 @@ return view.extend({

        let m, s, o, tabname;

-        m = new form.Map(tools.appName, _('Zapret2') + ' - ' + _('Settings'));
+        m = new form.Map(tools.appName, tools.AppName + ' - ' + _('Settings'));

        s = m.section(form.NamedSection, 'config');
        s.anonymous = true;
@@ -106,8 +106,12 @@ return view.extend({

        /* NFQWS_OPT_DESYNC tab */

-        tabname = 'nfqws2_params';
-        s.tab(tabname, _('NFQWS2 options'));
+        tabname = 'nfqws_params';
+        if (tools.appName == 'zapret2') {
+            s.tab(tabname, _('NFQWS2 options'));
+        } else {
+            s.tab(tabname, _('NFQWS options'));
+        }

        let add_delim = function(sec, url = null) {
            let o = sec.taboption(tabname, form.DummyValue, '_hr');
@@ -154,7 +158,11 @@ return view.extend({
            btn.onclick = () => new tools.longstrEditDialog('config', param, param, desc, rows, multiline).show();
        };

-        o = s.taboption(tabname, form.Flag, 'NFQWS2_ENABLE', _('NFQWS2_ENABLE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Flag, 'NFQWS2_ENABLE', _('NFQWS2_ENABLE'));
+        } else {
+            o = s.taboption(tabname, form.Flag, 'NFQWS_ENABLE', _('NFQWS_ENABLE'));
+        }
        o.rmempty = false;
        o.default = 1;

@@ -173,41 +181,77 @@ return view.extend({
        o.validate = function(section_id, value) { return true; };
        o.write = function(section_id, value) { return form.Value.prototype.write.call(this, section_id, (value == null || value.trim() == '') ? "\t" : value.trim()); };
        
-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP', _('NFQWS2_PORTS_TCP'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP', _('NFQWS2_PORTS_TCP'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP', _('NFQWS2_PORTS_UDP'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP', _('NFQWS2_PORTS_UDP'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP', _('NFQWS_PORTS_UDP'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_OUT', _('NFQWS2_TCP_PKT_OUT'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_OUT', _('NFQWS2_TCP_PKT_OUT'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_OUT', _('NFQWS_TCP_PKT_OUT'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_IN', _('NFQWS2_TCP_PKT_IN'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_IN', _('NFQWS2_TCP_PKT_IN'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_IN', _('NFQWS_TCP_PKT_IN'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_OUT', _('NFQWS2_UDP_PKT_OUT'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_OUT', _('NFQWS2_UDP_PKT_OUT'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_OUT', _('NFQWS_UDP_PKT_OUT'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_IN', _('NFQWS2_UDP_PKT_IN'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_IN', _('NFQWS2_UDP_PKT_IN'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_IN', _('NFQWS_UDP_PKT_IN'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP_KEEPALIVE', _('NFQWS2_PORTS_TCP_KEEPALIVE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP_KEEPALIVE', _('NFQWS2_PORTS_TCP_KEEPALIVE'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP_KEEPALIVE', _('NFQWS_PORTS_TCP_KEEPALIVE'));
+        }
        o.rmempty     = false;
        o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP_KEEPALIVE', _('NFQWS2_PORTS_UDP_KEEPALIVE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP_KEEPALIVE', _('NFQWS2_PORTS_UDP_KEEPALIVE'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP_KEEPALIVE', _('NFQWS_PORTS_UDP_KEEPALIVE'));
+        }
        o.rmempty     = false;
        o.datatype    = 'uinteger';

        add_delim(s, tools.nfqws_opt_url);
-        add_param(s, 'NFQWS2_OPT', null, 21, 2);
-
+        if (tools.appName == 'zapret2') {
+            add_param(s, 'NFQWS2_OPT', null, 21, 2);
+        } else {
+            add_param(s, 'NFQWS_OPT', null, 21, 2);
+        }
+        
        /* AutoHostList settings */

        tabname = 'autohostlist_tab'; 
@@ -227,13 +271,19 @@ return view.extend({
            return uci.set(tools.appName, section_id, 'MODE_FILTER', value === '1' ? 'autohostlist' : 'hostlist');
        };

-        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_INCOMING_MAXSEQ', _('INCOMING_MAXSEQ'));
-        o.rmempty     = false;
-        o.datatype    = 'uinteger';
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_INCOMING_MAXSEQ', _('INCOMING_MAXSEQ'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';

-        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_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'));
        o.rmempty     = false;
@@ -247,13 +297,15 @@ return view.extend({
        o.rmempty     = false;
        o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_IN', _('UDP_IN'));
-        o.rmempty     = false;
-        o.datatype    = 'uinteger';
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_IN', _('UDP_IN'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_OUT', _('UDP_OUT'));
-        o.rmempty     = false;
-        o.datatype    = 'uinteger';
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_OUT', _('UDP_OUT'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
+        }

        o = s.taboption(tabname, form.Button, '_auto_host_btn', _('Auto host list entries'));
        o.inputtitle = _('Edit');
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
@@ -4,6 +4,7 @@
 'require rpc';
 'require ui';
 'require uci';
+'require view.zapret2.env as env_tools';

 document.head.append(E('style', {'type': 'text/css'},
 `
@@ -35,32 +36,11 @@ document.head.append(E('style', {'type': 'text/css'},
 `));

 return baseclass.extend({
-    packager          : null,
-    appName           : 'zapret2',
-    execPath          : '/etc/init.d/zapret2',
-    syncCfgPath       : '/opt/zapret2/sync_config.sh',
-    defCfgPath        : '/opt/zapret2/def-cfg.sh',
-    defaultCfgPath    : '/opt/zapret2/restore-def-cfg.sh',
-
-    hostsGoogleFN     : '/opt/zapret2/ipset/zapret-hosts-google.txt',
-    hostsUserFN       : '/opt/zapret2/ipset/zapret-hosts-user.txt',
-    hostsUserExcludeFN: '/opt/zapret2/ipset/zapret-hosts-user-exclude.txt',
-    iplstExcludeFN    : '/opt/zapret2/ipset/zapret-ip-exclude.txt',
-    iplstUserFN       : '/opt/zapret2/ipset/zapret-ip-user.txt',
-    iplstUserExcludeFN: '/opt/zapret2/ipset/zapret-ip-user-exclude.txt',
-    custFileMax       : 4,
-    custFileTemplate  : '/opt/zapret2/ipset/cust%s.txt',
-    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
-    customdFileFormat : '/opt/zapret2/init.d/openwrt/custom.d/%s-script.sh',
-    discord_num       : 50,
-    discord_url       : [ 'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-discord-media',
-                          'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-stun4all',
-                          'https://github.com/bol-van/zapret2/tree/master/init.d/custom.d.examples.linux'
-                        ],
-    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/',
-
-    autoHostListFN    : '/opt/zapret2/ipset/zapret-hosts-auto.txt',
-    autoHostListDbgFN : '/opt/zapret2/ipset/zapret-hosts-auto-debug.log',
+    __init__() {
+        env_tools.load_env(this);
+        //console.log('appName: ' + this.appName);
+        //console.log('PACKAGER: ' + this.packager.name);
+    }, 

    infoLabelRunning  : '<span class="label-status running">'  + _('Running')  + '</span>',
    infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
@@ -99,24 +79,7 @@ return baseclass.extend({
        expect: { result: false }
    }),

-    init_consts: function() {
-        if (!this.packager) {
-            this.packager = { };
-            if (L.hasSystemFeature('apk')) {
-                this.packager.name = 'apk';
-                this.packager.path = '/usr/bin/apk';
-                this.packager.args = [ 'list', '-I', '*zapret2*' ];
-            } else {
-                this.packager.name = 'opkg';
-                this.packager.path = '/bin/opkg';
-                this.packager.args = [ 'list-installed', '*zapret2*' ];
-            }
-            //console.log('PACKAGER: ' + this.packager.name);
-        }
-    },
-
    getSvcInfo: function(svc_name = null) {
-        this.init_consts();
        let name = (svc_name) ? svc_name : this.appName;
        let verbose = 1;
        return this.callServiceList(name, verbose).then(res => {
@@ -127,7 +90,6 @@ return baseclass.extend({
    },

    getInitState: function(name) {
-        this.init_consts();
        return this.callInitState(name).then(res => {
            if (res) {
                return res[name].enabled ? true : false;
@@ -140,7 +102,6 @@ return baseclass.extend({
    },

    getStratList: function() {
-        this.init_consts();
        let exec_cmd = '/bin/busybox';
        let exec_arg = [ 'awk', '-F', '"', '/if \\[ "\\$strat" = "/ {print $4}', this.defCfgPath ];
        return fs.exec(exec_cmd, exec_arg).then(res => {
@@ -270,9 +231,9 @@ return baseclass.extend({
            return -4;
        }
        let jdata = svc_info;
-        if (typeof(jdata.zapret2) == 'object') {
+        if (typeof(jdata[this.appName]) == 'object') {
            result.dmn.inited = true;
-            let dmn_list = jdata.zapret2.instances;
+            let dmn_list = jdata[this.appName].instances;
            if (typeof(dmn_list) == 'object') {
                for (const [dmn_name, daemon] of Object.entries(dmn_list)) {
                    result.dmn.total += 1;
@@ -466,10 +427,11 @@ return baseclass.extend({
            this.desc        = desc;
            this.rows        = rows;
            this.multiline   = multiline;
+            env_tools.load_env(this);
        },

        load: function() {
-            let value = uci.get('zapret2', this.cfgsec, this.cfgparam);
+            let value = uci.get(this.appName, this.cfgsec, this.cfgparam);
            if (typeof(value) === 'string') {
                value = value.trim();
                if (this.multiline == 2) {
@@ -498,7 +460,7 @@ return baseclass.extend({
                                'class': 'cbi-input-textarea',
                                'style': 'width:100% !important',
                                'rows': this.rows,
-                                'wrap': 'on',
+                                'wrap': 'off',
                                'spellcheck': 'false',
                            },
                            content)
@@ -544,31 +506,29 @@ return baseclass.extend({
            value = value.replace(/˂/g, '<');
            value = value.replace(/˃/g, '>');
            try {
-                let elem2 = null;
-                let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
+                let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam);
                if (elem) {
-                    if (!elem2) {
-                        elem2 = elem.querySelector('div');
-                    }
-                    if (!elem2) {
-                        elem2 = elem.querySelector('output');
+                    if (elem.querySelector('div')) {
+                        elem = elem.querySelector('div');
+                    } else {
+                        elem = elem.querySelector('output');
                    }
                }
-                if (elem2) {
+                if (elem) {
                    let val = value.trim();
                    if (this.multiline) {
                        val = val.replace(/</g, '˂');
                        val = val.replace(/>/g, '˃');
                        val = val.replace(/\n/g, '<br/>');
-                        elem2.innerHTML = val;
+                        elem.innerHTML = val;
                    } else {
-                        elem2.textContent = val;
+                        elem.textContent = val;
                    }
                }
            } catch(e) {
-                console.error('ERROR: cannot found elem for ' + this.cfgparam);
+                console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);
            }
-            uci.set('zapret2', this.cfgsec, this.cfgparam, value);
+            uci.set(this.appName, this.cfgsec, this.cfgparam, value);
            uci.save().then(ui.hideModal);
        },

@@ -602,4 +562,93 @@ return baseclass.extend({
        },
    }),

+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, cbarg = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    {
+        function appendLog(msg, end = '\n')
+        {
+            logArea.value += msg + end;
+            logArea.scrollTop = logArea.scrollHeight;
+        }
+        function fixLogEnd()
+        {
+            if (logArea.value && logArea.value.slice(-1) != '\n') {
+                appendLog('');
+            }
+        }
+        let hide_rows = Array.isArray(hiderow) ? hiderow : [ hiderow ];
+        let rpc_opt = { "timeout": rpc_timeout*1000 };
+        if (rpc_root) {
+            rpc_opt.uid = 0;  // run under root
+        }
+        const logFile = log;  // file for reading: '/tmp/zapret_pkg_install.log'
+        const rcFile = logFile + '.rc';
+        try {
+            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
+            appendLog('Output file cleared!');
+        } catch (e) {
+            return callback(cbarg, 500, 'ERROR: Failed to clear output file');
+        }
+        try {
+            let opt_list = [ logFile ];
+            opt_list.push(...cmd);
+            let res = await fs.exec(this.appDir+'/script-exec.sh', opt_list, null, rpc_opt);
+            if (res.code != 0) {
+                return callback(cbarg, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
+            }
+            appendLog('Process started...');
+        } catch (e) {
+            return callback(cbarg, 520, 'ERROR: Failed on execute process: ' + e.message);
+        }
+        let lastLen = 0;
+        let retCode = -1;
+        let timerBusy = false;
+        let timer = setInterval(async () => {
+            if (timerBusy)
+                return;  // skip iteration
+            timerBusy = true;
+            try {
+                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
+                if (res.stdout && res.stdout.length > lastLen) {
+                    let log = res.stdout.slice(lastLen);
+                    hide_rows.forEach(re => {
+                        log = log.replace(re, '');
+                    });                    
+                    appendLog(log, '');
+                    lastLen = res.stdout.length;
+                }
+                if (retCode < 0) {
+                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
+                    if (rc.code != 0) {
+                        clearInterval(timer);
+                        fixLogEnd();
+                        return callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"');
+                    }
+                    if (rc.stdout) {
+                        retCode = parseInt(rc.stdout.trim(), 10);
+                    }
+                }
+                if (retCode >= 0) {
+                    clearInterval(timer);
+                    fixLogEnd();
+                    if (retCode == 0 && res.stdout) {
+                        return callback(cbarg, 0, res.stdout);
+                    }
+                    return callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode);
+                }
+            } 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);
+    },
+
 });
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js
@@ -14,22 +14,25 @@ const btn_style_negative = 'btn cbi-button-reset important';
 const btn_style_warning  = 'btn cbi-button-negative';
 const btn_style_success  = 'btn cbi-button-success important';

-const fn_update_pkg_sh   = '/opt/zapret2/update-pkg.sh';
+const fn_update_pkg_sh   = '/opt/'+tools.appName+'/update-pkg.sh';

 return baseclass.extend({
    releasesUrlPrefix : 'https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/',
    
-    appendLog: function(msg, end = '\n') {
+    appendLog: function(msg, end = '\n')
+    {
        this.logArea.value += msg + end;
        this.logArea.scrollTop = this.logArea.scrollHeight;
    },

-    setBtnMode: function(enable) {
+    setBtnMode: function(enable)
+    {
        this.btn_cancel.disabled = enable ? false : true;
        this.btn_action.disabled = (enable == 2) ? false : true;
    },
    
-    setStage: function(stage, btn_flag = true) {
+    setStage: function(stage, btn_flag = true)
+    {
        if (stage == 0) {
            this.btn_action.textContent = _('Check for updates');
            this.btn_action.classList.remove('hidden');
@@ -46,146 +49,94 @@ return baseclass.extend({
        this.stage = stage;
    },
    
-    checkUpdates: function() {
+    checkUpdates: async function()
+    {
+        this._action = 'checkUpdates';
        this.setStage(0);
        this.setBtnMode(0);
        this.pkg_url = null;
        this.appendLog(_('Checking for updates...'));
-        let opt_list = [ '-c' ];  // check for updates
+        let cmd = [ fn_update_pkg_sh, '-c' ];  // check for updates
        if (document.getElementById('cfg_exclude_prereleases').checked == false) {
-            opt_list.push('-p');  // include prereleases ZIP-files 
+            cmd.push('-p');  // include prereleases ZIP-files
        }
-        let forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
-        let rpc_opt = { timeout: 20*1000 }
-        //rpc_opt.uid = 0;  // run under root
-        let res = fs.exec(fn_update_pkg_sh, opt_list, null, rpc_opt).then(res => {
-            let log = res.stdout.trim();
-            this.appendLog(log);
-            let code = log.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-            let pkg_url = log.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
-            if (res.code == 0 && code && pkg_url) {
-                this.pkg_url = pkg_url[1];
-                code = code[1];
-                if (code == 'E' && !forced_reinstall) {
-                    this.setStage(999);
-                    return 0;
-                }
-                this.setStage(1);
-                this.setBtnMode(2);  // enable all buttons
-            } else {
-                if (res.code != 0) {
-                    this.appendLog('ERROR: Check for updates failed with error ' + res.code);
-                }
-                this.setStage(999);
-            }
-            return res.code;
-        }).catch(e => {
-            this.appendLog('ERROR: ' + _('Updates checking failed'));
-            this.appendLog('ERROR: ' + e);
-            this.setStage(999);
-            return 1;
-        }).finally(() => {
-            this.appendLog('=========================================================');
-        });
+        this.forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
+        let log = '/tmp/'+tools.appName+'_pkg_check.log';
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
    },

-    installUpdates: async function() {
+    installUpdates: async function()
+    {
+        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);
-            return 1;
+            return;
        }
        this.appendLog(_('Install updates...'));
-        let opt_list = [ '-u', this.pkg_url ];  // update packages
+        let cmd = [ fn_update_pkg_sh, '-u', this.pkg_url ];  // update packages
        if (document.getElementById('cfg_forced_reinstall').checked == true) {
-            opt_list.push('-f');  // forced reinstall if same version
+            cmd.push('-f');  // forced reinstall if same version
        }
-        let rpc_opt = { timeout: 5*1000 }
-        //rpc_opt.uid = 0;  // run under root
-        const logFile = '/tmp/zapret2_pkg_install.log';
-        const rcFile = logFile + '.rc';
-        try {
-            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
-            this.appendLog('Install log cleared.');
-        } catch (e) {
-            this.appendLog('ERROR: Failed to clear log file');
-            this.setStage(999);
-            return 1;
-        }
-        try {
-            let opt = [ logFile, fn_update_pkg_sh ];
-            //opt.push('-t'); opt.push('0');  // only for testing
-            opt.push(...opt_list);
-            let res = await fs.exec('/opt/zapret2/script-exec.sh', opt, null, rpc_opt);
-            if (res.code == 0) {
-                this.appendLog('Process started...');
-            } else {
-                this.appendLog('ERROR: cannot run ' + fn_update_pkg_sh + ' script! (error = ' + res.code + ')');
-                throw new Error('cannot run script');
-            }
-        } catch (e) {
-            this.appendLog('ERROR: Failed to start process: ' + e.message);
-            this.setStage(999);
-            return 1;
-        }
-        let lastLen = 0;
-        let retCode = -1;
-        let timerBusy = false;
-        let timer = setInterval(async () => {
-            if (timerBusy)
-                return;  // skip iteration
-            timerBusy = true;
-            try {
-                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
-                if (res.stdout && res.stdout.length > lastLen) {
-                    let log = res.stdout.slice(lastLen);
-                    log = log.replace(/^ \* resolve_conffiles.*(?:\r?\n|$)/gm, '');
-                    this.appendLog(log, '');
-                    lastLen = res.stdout.length;
-                }
-                if (retCode < 0) {
-                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
-                    if (rc.code != 0) {
-                        throw new Error('cannot read file "' + rcFile + '"');
-                    }
-                    if (rc.stdout) {
-                        retCode = parseInt(rc.stdout.trim(), 10);
-                    }
-                }
-                if (retCode >= 0) {
-                    clearInterval(timer);
-                    this.appendLog('\n' + 'Process finished.');
-                    if (res.stdout) {
-                        let code = res.stdout.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-                        if (retCode == 0 && code && code[1] == '+') {
-                            this.stage = 999;
-                            this.btn_action.textContent = _('OK');
-                            this.btn_action.disabled = false;
-                            this.btn_cancel.disabled = true;
-                            return 0;
-                        }
-                    }
-                    this.appendLog('ERROR: Install updates failed with error ' + retCode);
-                    this.setStage(999);
-                }
-            } catch (e) {
-                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
-                    console.warn('WARN: installUpdates: ' + e.message);
-                    return;  // goto next timer iteration
-                }
-                clearInterval(timer);
-                this.appendLog('ERROR: installUpdates: ' + e.message);
-                this.appendLog('ERROR: installUpdates: ' + e.stack?.trim().split('\n')[0]);
-                this.setStage(999);
-            } finally {
-                timerBusy = false;
-            }
-        }, 500);
+        //this._test = 1; cmd.push('-t'); cmd.push('45');  // only for testing
+        let log = '/tmp/'+tools.appName+'_pkg_install.log';
+        let hiderow = /^ \* resolve_conffiles.*(?:\r?\n|$)/gm;
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, hiderow: hiderow, callback: callback, cbarg: wnd });
    },
-    
-    openUpdateDialog: function(pkg_arch) {
+
+    execAndReadCallback: function(wnd, rc, txt = '')
+    {
+        //console.log('execAndReadCallback = ' + rc + '; _action = ' + wnd._action);
+        if (rc == 0 && txt) {
+            let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
+            if (wnd._action == 'checkUpdates') {
+                let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
+                if (code && pkg_url) {
+                    wnd.appendLog('=========================================================');
+                    wnd.pkg_url = pkg_url[1];
+                    code = code[1];
+                    if (code == 'E' && !wnd.forced_reinstall) {
+                        wnd.setStage(999);  // install not needed
+                        return;
+                    }
+                    wnd.setStage(1);
+                    wnd.setBtnMode(2);  // enable all buttons
+                    return;  // install allowed
+                }
+            }
+            if (wnd._action == 'installUpdates') {
+                if (wnd._test || (code && code[1] == '+')) {
+                    wnd.stage = 999;
+                    wnd.btn_action.textContent = _('OK');
+                    wnd.btn_action.disabled = false;
+                    wnd.btn_cancel.disabled = true;
+                    return;
+                }
+            }
+        }
+        if (rc >= 500) {
+            if (txt) {
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+            } else {
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
+            }
+        } else {
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
+        }
+        wnd.setStage(999);
+        if (wnd._action == 'checkUpdates') {
+            wnd.appendLog('=========================================================');
+        }
+    },
+
+    openUpdateDialog: function(pkg_arch)
+    {
        this.stage = 0;
        this.pkg_arch = pkg_arch;
        this.pkg_url = null;
@@ -201,8 +152,11 @@ return baseclass.extend({
        ]);

        this.logArea = E('textarea', {
+            'id': 'widget.modal_content',
            'readonly': true,
-            'style': 'width:100%; height:400px; font-family: monospace;'
+            'style': 'width:100% !important; font-family: monospace;',
+            'rows': 20,
+            'wrap': 'off',
        });

        this.btn_cancel = E('button', {
--- a/zapret2/Makefile
+++ b/zapret2/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret2
-PKG_VERSION:=0.8.20260109
+PKG_VERSION:=0.8.20260113
 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/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8e6387a6dfdaa227b50a34f4beb1d5ec2a770d54
-PKG_SOURCE_DATE:=2026-01-09
+PKG_SOURCE_VERSION:=dced388652c49fea6eb82401f79146b484a9cd7a
+PKG_SOURCE_DATE:=2026-01-13

 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
@@ -72,16 +72,23 @@ define Build/Compile
 endef

 define Package/$(PKG_NAME)/conffiles
-/etc/config/zapret2
 /opt/zapret2/config
-/opt/zapret2/ipset/
-/opt/zapret2/init.d/openwrt/custom.d/
+/opt/zapret2/ipset/zapret-hosts-google.txt
+/opt/zapret2/ipset/zapret-hosts-user.txt
+/opt/zapret2/ipset/zapret-hosts-user-exclude.txt
+/opt/zapret2/ipset/zapret-ip-exclude.txt
+/opt/zapret2/ipset/zapret-hosts-auto.txt
+/opt/zapret2/init.d/openwrt/custom.d/10-script.sh
+/opt/zapret2/init.d/openwrt/custom.d/20-script.sh
+/opt/zapret2/init.d/openwrt/custom.d/50-script.sh
+/opt/zapret2/init.d/openwrt/custom.d/60-script.sh
+/opt/zapret2/init.d/openwrt/custom.d/90-script.sh
 endef

 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/opt/zapret2
 	$(INSTALL_DIR) $(1)/opt/zapret2/$(MAKE_PATH)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)/opt/zapret2/$(MAKE_PATH)/	
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)/opt/zapret2/$(MAKE_PATH)/
 	$(INSTALL_DIR) $(1)/opt/zapret2/ip2net
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret2/ip2net/
 	$(INSTALL_DIR) $(1)/opt/zapret2/mdig
@@ -109,6 +116,7 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret2
 	$(INSTALL_DATA) ./config.default $(1)/opt/zapret2/config.default
+	$(INSTALL_DATA) ./config.default $(1)/opt/zapret2/config
 	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret2/ipset/zapret-hosts-google.txt
 	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret2/ipset/zapret-hosts-user.txt
 	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret2/ipset/zapret-hosts-user-exclude.txt
@@ -124,19 +132,24 @@ define Package/$(PKG_NAME)/install
 	$(CP) ./custom.d/* $(1)/opt/zapret2/init.d/openwrt/custom.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret2-uci-def-cfg.sh
-	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/opt/zapret2/uci-def-cfg.sh
-	$(INSTALL_BIN) ./comfunc.sh         $(1)/opt/zapret2/comfunc.sh
-	$(INSTALL_BIN) ./def-cfg.sh         $(1)/opt/zapret2/def-cfg.sh
-	$(INSTALL_BIN) ./renew-cfg.sh       $(1)/opt/zapret2/renew-cfg.sh
-	$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret2/restore-def-cfg.sh
-	$(INSTALL_BIN) ./sync_config.sh     $(1)/opt/zapret2/sync_config.sh
-	$(INSTALL_BIN) ./script-exec.sh     $(1)/opt/zapret2/script-exec.sh
-	$(INSTALL_BIN) ./update-pkg.sh      $(1)/opt/zapret2/update-pkg.sh
-	# Fix permisions
+	# install all sh-scripts
+	$(CP) ./*.sh $(1)/opt/zapret2/
+	rm -f $(1)/opt/zapret2/init.d.sh
+	# Create empty conf files
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/ipset/zapret-hosts-auto.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/ipset/cust1.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/ipset/cust2.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/ipset/cust3.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/ipset/cust4.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/init.d/openwrt/custom.d/10-script.sh
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/init.d/openwrt/custom.d/20-script.sh
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/init.d/openwrt/custom.d/60-script.sh
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret2/init.d/openwrt/custom.d/90-script.sh
+	# Fix permissions
 	chmod 644 $(1)/opt/zapret2/ipset/*.txt
 	chmod 644 $(1)/opt/zapret2/ipset_def/*.txt
 	chmod 644 $(1)/opt/zapret2/init.d/openwrt/custom.d/*.sh
-	chmod 644 $(1)/opt/zapret2/config.default
+	chmod 644 $(1)/opt/zapret2/config*
 	chmod 755 $(1)/opt/zapret2/*.sh
 	chmod 755 $(1)/opt/zapret2/$(MAKE_PATH)/*
 	chmod 755 $(1)/opt/zapret2/ip2net/*
@@ -147,19 +160,66 @@ define Package/$(PKG_NAME)/preinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	if [ -f "/etc/init.d/zapret2" ]; then
-		SCRIPT=$$( readlink /etc/init.d/zapret2 )
+	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_CFG=/etc/config/zapret2
+	if [ -f "$${ZAPRET_INITD}" ]; then
+		SCRIPT=$$( readlink "$${ZAPRET_INITD}" )
 		if [ -n "$${SCRIPT}" ]; then
-			echo "Please uninstall original zapret2 utility!"
+			echo "Please uninstall incompatible \"zapret2\" 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/zapret2" ]; then
-			/etc/init.d/zapret2 running && /etc/init.d/zapret2 stop >/dev/null 2>&1
+		if [ -x "$${ZAPRET_INITD}" ]; then
+			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
+	if $${PKG_CHECK} zapret2 >/dev/null 2>&1; then
+		if [ ! -f "/opt/zapret2/sync_config.sh" ]; then
+			echo "Please uninstall incompatible \"zapret2\" package!"
+			exit 47
+		fi
+		if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
+			echo "Please uninstall incompatible \"zapret2\" package!"
+			exit 48
+		fi
+	fi
+	if $${PKG_CHECK} luci-app-zapret2 >/dev/null 2>&1; then
+		SVC_FILE=/www/luci-static/resources/view/zapret2/service.js
+		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
+			echo "Please uninstall incompatible \"luci-app-zapret2\" package!"
+			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} zapret2-mdig >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret2-mdig
+	fi
+	if $${PKG_CHECK} zapret2-ip2net >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret2-ip2net
+	fi
+	if [ ! -d "$${ZAPRET_DIR}" ]; then
+		mkdir -p $${ZAPRET_DIR}
+	fi
 fi
 exit 0
 endef
@@ -168,14 +228,25 @@ define Package/$(PKG_NAME)/postinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
+	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_CFG=/etc/config/zapret2
 	ZAPRET_CONFIG=/opt/zapret2/config
 	ZAPRET_CONFIG_DEF="/opt/zapret2/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
 	# creating main config if its not exists
 	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
 		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/zapret2" ] && 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/zapret2/uci-def-cfg.sh
 	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret2 merged with default uci-config"
@@ -187,13 +258,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/zapret2 enable
+	$${ZAPRET_INITD} enable
 	# stop all
-	/etc/init.d/zapret2 stop_fw
-	/etc/init.d/zapret2 stop_daemons
+	$${ZAPRET_INITD} stop_fw >/dev/null 2>&1
+	$${ZAPRET_INITD} stop_daemons >/dev/null 2>&1
 	ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	# start main service
-	/etc/init.d/zapret2 start
+	$${ZAPRET_INITD} start
 	# restart firewall
 	[ -x /sbin/fw4 ] && fw4 -q restart || fw3 -q restart
 fi
@@ -204,8 +275,10 @@ define Package/$(PKG_NAME)/prerm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	EXEDIR=/opt/zapret2
+	ZAPRET_DIR=/opt/zapret2
 	ZAPRET_BASE=/opt/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_CFG=/etc/config/zapret2
 	ZAPRET_CONFIG=/opt/zapret2/config
 	ZAPRET_CONFIG_DEF="/opt/zapret2/config.default"
 	OPENWRT_FW_INCLUDE=/etc/firewall.zapret2
@@ -220,8 +293,8 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/fwtype.sh"
 	. "$${ZAPRET_BASE}/common/nft.sh"
 	. "$${ZAPRET_BASE}/common/installer.sh"
-	/etc/init.d/zapret2 running && /etc/init.d/zapret2 stop
-	/etc/init.d/zapret2 disable
+	$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
+	$${ZAPRET_INITD} disable >/dev/null 2>&1
 	ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	remove_openwrt_firewall
 	nft_del_table
@@ -234,7 +307,9 @@ define Package/$(PKG_NAME)/postrm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	[ -f "/etc/config/zapret2-opkg" ] && rm -f "/etc/config/zapret2-opkg"
+	rm -f /etc/config/zapret2-opkg*
+	rm -f /etc/config/zapret2.opkg*
+	rm -f /etc/config/zapret2.apk*
 	[ -f "/opt/zapret2/config" ] && cp -f /opt/zapret2/config "/opt/zapret2/config.backup"
 	#rm -rf /opt/zapret2
 	#echo "Directory /opt/zapret2 removed!"
--- a/zapret2/comfunc.sh
+++ b/zapret2/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
--- a/zapret2/config.default
+++ b/zapret2/config.default
@@ -34,6 +34,7 @@ IP2NET_OPT6="--prefix-length=56-64 --v6-threshold=5"
 # NOTE : set PKT_IN, PKT_OUT variables appropriately
 AUTOHOSTLIST_INCOMING_MAXSEQ=4096
 AUTOHOSTLIST_RETRANS_MAXSEQ=32768
+AUTOHOSTLIST_RETRANS_RESET=1
 AUTOHOSTLIST_RETRANS_THRESHOLD=3
 AUTOHOSTLIST_FAIL_THRESHOLD=3
 AUTOHOSTLIST_FAIL_TIME=60
@@ -44,6 +45,10 @@ AUTOHOSTLIST_DEBUGLOG=0

 # number of parallel threads for domain list resolves
 MDIG_THREADS=30
+# EAI_AGAIN retries
+MDIG_EAGAIN=10
+# delay between EAI_AGAIN retries (ms)
+MDIG_EAGAIN_DELAY=500

 # ipset/*.sh can compress large lists
 GZIP_LISTS=0
@@ -77,11 +82,10 @@ NFQWS2_PORTS_UDP="443"

 # PKT_OUT means connbytes dir original
 # PKT_IN means connbytes dir reply
-# this is --dpi-desync-cutoff=nX kernel mode implementation for linux. it saves a lot of CPU.
-NFQWS2_TCP_PKT_OUT="9"
-NFQWS2_TCP_PKT_IN="3"
-NFQWS2_UDP_PKT_OUT="9"
-NFQWS2_UDP_PKT_IN="0"
+NFQWS2_TCP_PKT_OUT="20"
+NFQWS2_TCP_PKT_IN="10"
+NFQWS2_UDP_PKT_OUT="5"
+NFQWS2_UDP_PKT_IN="3"

 # redirect outgoing traffic without connbytes limiter and incoming with connbytes limiter
 # normally it's needed only for stateless DPI that matches every packet in a single TCP session
--- a/zapret2/def-cfg.sh
+++ b/zapret2/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
@@ -23,6 +23,7 @@ function set_cfg_reset_values
 		# autohostlist options
 		set $cfgname.config.AUTOHOSTLIST_INCOMING_MAXSEQ='4096'
 		set $cfgname.config.AUTOHOSTLIST_RETRANS_MAXSEQ='32768'
+		set $cfgname.config.AUTOHOSTLIST_RETRANS_RESET='1'
 		set $cfgname.config.AUTOHOSTLIST_RETRANS_THRESHOLD='3'
 		set $cfgname.config.AUTOHOSTLIST_FAIL_THRESHOLD='3'
 		set $cfgname.config.AUTOHOSTLIST_FAIL_TIME='60'
@@ -36,10 +37,10 @@ function set_cfg_reset_values
 		set $cfgname.config.FILTER_MARK='$TAB'
 		set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
 		set $cfgname.config.NFQWS2_PORTS_UDP='443'
-		set $cfgname.config.NFQWS2_TCP_PKT_OUT='9'
-		set $cfgname.config.NFQWS2_TCP_PKT_IN='3'
-		set $cfgname.config.NFQWS2_UDP_PKT_OUT='9'
-		set $cfgname.config.NFQWS2_UDP_PKT_IN='0'
+		set $cfgname.config.NFQWS2_TCP_PKT_OUT='20'
+		set $cfgname.config.NFQWS2_TCP_PKT_IN='10'
+		set $cfgname.config.NFQWS2_UDP_PKT_OUT='5'
+		set $cfgname.config.NFQWS2_UDP_PKT_IN='3'
 		set $cfgname.config.NFQWS2_PORTS_TCP_KEEPALIVE='0'
 		set $cfgname.config.NFQWS2_PORTS_UDP_KEEPALIVE='0'
 		# save changes
@@ -51,7 +52,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.NFQWS2_PORTS_TCP='80,443'
@@ -65,7 +66,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'
--- a/zapret2/dwc.sh
+++ b/zapret2/dwc.sh
@@ -0,0 +1,119 @@
+#!/bin/sh
+# Copyright (c) 2026 remittor
+
+. /opt/zapret2/comfunc.sh
+
+ZAP_TMP_DIR=/tmp/zapret_dwc
+
+rm -rf $ZAP_TMP_DIR
+
+CURL_TIMEOUT=5
+CURL_RANGETO=65535
+
+if ! command -v curl >/dev/null 2>&1; then
+	echo "ERROR: package \"curl\" not installed!"
+	return 10
+fi
+CURL_INFO=$( curl -V )
+if ! echo "$CURL_INFO" | grep -q 'https'; then
+	echo "------- package curl"
+	echo "$CURL_INFO"
+	echo "-------"
+	echo "ERROR: package \"curl\" not supported HTTPS protocol!"
+	echo "NOTE: Please install package \"curl-ssl\""
+	return 11
+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='[
+  { id: "US.CF-01", provider: "🇺🇸 Cloudflare", times: 1, url: "https://img.wzstats.gg/cleaver/gunFullDisplay" },
+  { id: "US.CF-02", provider: "🇺🇸 Cloudflare", times: 1, url: "https://genshin.jmp.blue/characters/all#" },
+  { id: "US.CF-03", provider: "🇺🇸 Cloudflare", times: 1, url: "https://api.frankfurter.dev/v1/2000-01-01..2002-12-31" },
+  { id: "US.CF-04", provider: "🇨🇦 Cloudflare", times: 1, url: "https://www.bigcartel.com/" },
+  { id: "US.DO-01", provider: "🇺🇸 DigitalOcean", times: 2, url: "https://genderize.io/" },
+  { id: "DE.HE-01", provider: "🇩🇪 Hetzner", times: 1, url: "https://j.dejure.org/jcg/doctrine/doctrine_banner.webp" },
+  { id: "DE.HE-02", provider: "🇩🇪 Hetzner", times: 1, url: "https://maps.gnosis.earth/ogcapi/api/swagger-ui/swagger-ui-standalone-preset.js#" },
+  { id: "FI.HE-01", provider: "🇫🇮 Hetzner", times: 1, url: "https://251b5cd9.nip.io/1MB.bin" },
+  { id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8c176.nip.io/1MB.bin" },
+  { id: "FI.HE-03", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bdae.nip.io/1MB.bin" },
+  { id: "FI.HE-04", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bca5.nip.io/1MB.bin" },
+  { id: "FR.OVH-01", provider: "🇫🇷 OVH", times: 1, url: "https://eu.api.ovh.com/console/rapidoc-min.js" },
+  { id: "FR.OVH-02", provider: "🇫🇷 OVH", times: 1, url: "https://ovh.sfx.ovh/10M.bin" },
+  { id: "SE.OR-01", provider: "🇸🇪 Oracle", times: 1, url: "https://oracle.sfx.ovh/10M.bin" },
+  { id: "DE.AWS-01", provider: "🇩🇪 AWS", times: 1, url: "https://www.getscope.com/assets/fonts/fa-solid-900.woff2" },
+  { id: "US.AWS-01", provider: "🇺🇸 AWS", times: 1, url: "https://corp.kaltura.com/wp-content/cache/min/1/wp-content/themes/airfleet/dist/styles/theme.css" },
+  { id: "US.GC-01", provider: "🇺🇸 Google Cloud", times: 1, url: "https://api.usercentrics.eu/gvl/v3/en.json" },
+  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/main.c7b61d59416f714f.js" },
+  { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
+  { id: "US.AKM-01", provider: "🇺🇸 Akamai", times: 1, url: "https://www.roxio.com/static/roxio/images/products/creator/nxt9/call-action-footer-bg.jpg" },
+  { id: "PL.AKM-01", provider: "🇵🇱 Akamai", times: 1, url: "https://media-assets.stryker.com/is/image/stryker/gateway_1?$max_width_1410$" },
+  { id: "US.CDN77-01", provider: "🇺🇸 CDN77", times: 1, url: "https://cdn.eso.org/images/banner1920/eso2520a.jpg" },
+  { id: "FR.CNTB-01", provider: "🇫🇷 Contabo", times: 1, url: "https://airsea.no/images/main_logo.png" },
+  { id: "NL.SW-01", provider: "🇳🇱 Scaleway", times: 1, url: "https://www.velivole.fr/img/header.jpg" },
+  { id: "US.CNST-01", provider: "🇺🇸 Constant", times: 1, url: "https://cdn.xuansiwei.com/common/lib/font-awesome/4.7.0/fontawesome-webfont.woff2?v=4.7.0" }
+]'
+
+function trim
+{
+	echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
+}
+
+mkdir -p $ZAP_TMP_DIR
+
+ID=0
+while IFS='|' read -r TAG PROVIDER TIMES URL; do
+	[ -z "$TAG" ] && continue
+	ID=$((ID+1))
+	ID3=$(printf '%03d' "$ID")
+	COUNTRY="$(echo "$TAG" | cut -d. -f1)"
+	CNTFLAG="$(echo "$PROVIDER" | awk '{print $1}')"
+	PROVIDER="$(echo "$PROVIDER" | cut -d' ' -f2-)"
+	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"
+	(
+		DST_IP=$( curl -4 -s -o /dev/null -w '%{remote_ip}\n' $DOMAIN )
+		if [ -z "$DST_IP" ]; then
+			DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
+		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
+	) >"$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER.txt" 2>&1 &
+done <<EOF
+$(printf '%s\n' "$TEST_SUITE" | sed -n '
+s/.*id:[[:space:]]*"\([^"]*\)".*provider:[[:space:]]*"\([^"]*\)".*times:[[:space:]]*\([0-9]\+\).*url:[[:space:]]*"\([^"]*\)".*/\1|\2|\3|\4/p
+')
+EOF
+
+wait
+
+printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
+	[ -f "$file" ] || continue
+	FNAME="${file##*/}"
+	ID=$( echo "$FNAME" | cut -d= -f1)
+	TAG=$( echo "$FNAME" | cut -d= -f2)
+	PROVIDER=$(echo "$FNAME" | cut -d= -f3 | sed 's/\.txt$//' )
+	res=$( cat "$file" )
+	res=$( trim "$res" )
+	status=
+	case "$res" in
+		''|*[!0-9]*)
+			status="Error (incorrect value)"
+			;;
+	esac
+	if [ -z "$status" ]; then
+		if [ "$res" = 0 ]; then
+			status="Possibly detected"
+		elif [ "$res" -lt $CURL_RANGETO ]; then
+			status="Failed to complete detection"
+		else
+			status="[ OK ]"
+		fi
+	fi
+	printf '%12s / %-13s: %s \n' "$TAG" "$PROVIDER" "$status"
+done
+
+return 0 
--- a/zapret2/ipset/zapret-hosts-user-exclude.txt
+++ b/zapret2/ipset/zapret-hosts-user-exclude.txt
@@ -14,6 +14,7 @@ gosuslugi.ru
 mos-gorsud.ru
 gov.ru
 sudrf.ru
+ottai.com
 ipstream.one
 #################################### Epicgames
 easy.ac
@@ -253,4 +254,109 @@ vod-secure.twitch.tv
 irc-ws.chat.twitch.tv
 pubsub-edge.twitch.tv
 vod-pop-secure.twitch.tv
+#################################### Valorant
+pvp.net
+vivox.com
+sd-rtn.com
+riotcdn.net
+adobess.com
+valorant.com
+akamaihd.net
+riotgames.com
+playvalorant.com
+#################################### 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
 ####################################
--- a/zapret2/sync_config.sh
+++ b/zapret2/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
--- a/zapret2/uci-def-cfg.sh
+++ b/zapret2/uci-def-cfg.sh
@@ -1,11 +1,15 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor

+[ ! -f /opt/zapret2/comfunc.sh ] && exit 0
+
 . /opt/zapret2/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
 	
--- a/zapret2/update-pkg.sh
+++ b/zapret2/update-pkg.sh
@@ -32,7 +32,7 @@ if [ "$EXE_DIR" = "/tmp" ]; then
 		opt_forced="true"
 	fi
 else
-	[ -f "$EXE_DIR/comfunc.sh" ] || { echo "ERROR: file $EXE_DIR/comfunc.sh not founded!"; exit 1; }
+	[ -f "$EXE_DIR/comfunc.sh" ] || { echo "ERROR: file $EXE_DIR/comfunc.sh not found!"; exit 1; }
 	. $EXE_DIR/comfunc.sh
 fi

@@ -110,7 +110,7 @@ function pkg_mgr_update
 	if [ "$PKG_MGR" = "opkg" ]; then
 		PKG_TOTAL=$( opkg list | wc -l )
 		PKG_INSTALLED=$( opkg list-installed | wc -l )
-		if [ "$PKG_TOTAL" = "$PKG_INSTALLED" ]; then
+		if [ "$PKG_TOTAL" -le "$PKG_INSTALLED" ] || [[ "$PKG_TOTAL" -le $((PKG_INSTALLED + 100)) ]]; then
 			echo ">>> OPKG update..."
 			opkg update
 			return $?
@@ -336,8 +336,8 @@ function get_actual_release
 		return 0
 	done
 	json_cleanup
-	echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not founded!"
-	return 150  # release not founded
+	echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not found!"
+	return 150  # release not found
 }

 # -------------------------------------------------------------------------------------------------------
@@ -410,7 +410,7 @@ echo "Current installed version: $ZAP_CUR_PKG_VER"
 if [ "$opt_update" = "" ]; then
 	ZAP_PKG_URL="$REL_ACTUAL_URL"
 	if [ "$ZAP_PKG_URL" = "" ]; then
-		echo "ERROR: actual release not founded!"
+		echo "ERROR: actual release not found!"
 		return 199
 	fi
 else
@@ -419,7 +419,7 @@ else
 		ZAP_PKG_URL="$REL_ACTUAL_URL"
 	fi
 	if [ "$opt_update" = "@" -a "$ZAP_PKG_URL" = "" ]; then
-		echo "ERROR: actual release not founded!"
+		echo "ERROR: actual release not found!"
 		return 199
 	fi
 fi
@@ -494,7 +494,7 @@ if [ "$opt_update" != "" ]; then
 	rm -f "$ZAP_PKG_FN" 2>/dev/null
 	if [ "$PKG_MGR" = "apk" ]; then
 		if [ ! -d "$ZAP_PKG_DIR/apk" ]; then
-			echo "ERROR: APK-files not founded"
+			echo "ERROR: APK-files not found"
 			return 221
 		fi
 		rm -f $ZAP_PKG_DIR/*.ipk 2>/dev/null
Author	SHA1	Message	Date
remittor	ee8089e1bb	Bump version to v0.8.20260113	2026-01-13 14:37:26 +03:00
remittor	4dd7030c60	makefile: Fix conffiles section and other fixes	2026-01-13 14:31:21 +03:00
remittor	00490e3b5d	shell: Fix sh-scripts (copilot)	2026-01-13 14:17:07 +03:00
remittor	126e7dea89	Fix uci-def-cfg.sh	2026-01-13 14:15:25 +03:00
remittor	fc85552e4e	updater: Fix pkg_mgr_update for opkg	2026-01-13 14:14:57 +03:00
remittor	e15eaafa33	luci: Add description for "Diagnostics" button	2026-01-13 14:11:00 +03:00
remittor	5b331132a1	github: releases: Add step "Wait for GitHub API consistency"	2026-01-12 22:51:52 +03:00
remittor	5711c1f2d4	config: Fix sync for AUTOHOSTLIST_RETRANS_RESET	2026-01-12 21:56:01 +03:00
remittor	0ee7ae325e	diag: Fix bugs in dwc.sh	2026-01-11 19:09:07 +03:00
remittor	c4ce5c1aeb	diag: Fix load comfunc.sh	2026-01-11 17:30:42 +03:00
remittor	d50aa75e94	makefile: skip init.d.sh	2026-01-11 16:09:35 +03:00
remittor	77f8f94d38	Bump version to v0.8.20260111	2026-01-11 15:31:38 +03:00
remittor	f7e01283e7	diag: Fix DPI checker	2026-01-11 15:30:48 +03:00
remittor	5b997a5eb5	config: Add new option AUTOHOSTLIST_RETRANS_RESET	2026-01-11 14:49:19 +03:00
remittor	0e2940c338	ipset: Update zapret-hosts-user-exclude.txt	2026-01-11 14:21:48 +03:00
remittor	0e31e5d804	Add diagnostic button (DPI checker)	2026-01-11 11:54:19 +03:00
remittor	ab50c2099b	luci: updater: Add new func tools.execAndRead	2026-01-10 20:51:11 +03:00
remittor	17afabe150	luci: Fix update text after edit for NFQWS2_OPT	2026-01-10 10:56:58 +03:00
remittor	2ecf3cf5d0	luci: Fix js-files for unification	2026-01-09 22:31:11 +03:00
remittor	9e8046d734	luci: Splitting file tools.js into two parts (add file env.js)	2026-01-09 21:58:12 +03:00
remittor	c68236c8fd	Replace "founded" to "found"	2026-01-09 17:36:26 +03:00
remittor	706f92fea7	config: Update default values src: https://github.com/bol-van/zapret2/commits/master/config.default	2026-01-09 17:10:18 +03:00