Bump version to v70.20250116

Source: https://github.com/bol-van/zapret-win-bundle/blob/master/zapret-winws/preset_russia.cmd

.github/workflows/build.yml

@@ -2,9 +2,37 @@ name: build
 
 on:
   workflow_dispatch:
+    inputs:
+      fake_build:
+        description: 'Fake build'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
+      max_speed:
+        description: 'Build with max speed'
+        required: false
+        default: 'true'
+        type: choice
+        options:
+        - true
+        - false
   push:
     tags:
-      - '*'
+      - v[0-9]+*
+
+env:
+  FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
+  SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || '' }}
+  REPO_URL: https://github.com/remittor/zapret-openwrt
+  REPO_LNK: remittor/zapret-openwrt
+  REPO_BRANCH: master
+  BUILD_ROOT: ${{ github.workspace }}/builder
+  BUILD_DATE: unknown
+  REPO_DATE: unknown
+  LUCI_ARCH: aarch64_cortex-a53
 
 jobs:
   check:
@@ -15,38 +43,43 @@ jobs:
       sha: ${{ steps.gh.outputs.sha }}
       url: ${{ steps.gh.outputs.url }}
       message: ${{ steps.gh.outputs.message }}
+      build_date: ${{ steps.gh.outputs.build_date }}
+      fw_date: ${{ steps.gh.outputs.fw_date }}
       is_active: ${{ steps.activity.outputs.is_active }}
     steps:
       - name: Get repo data via GH API
         id: gh
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: 'remittor/zapret-openwrt'
         run: |
           echo "Tag name from GITHUB_REF_NAME: $GITHUB_REF_NAME"
           echo "Tag name from github.ref_name: ${{ github.ref_name }}"
-          BRANCH=$(gh api repos/$REPO --jq '.default_branch')
-          DATE=$(gh api repos/$REPO/commits/$BRANCH --jq '.commit.committer.date')
+          BRANCH=$(gh api repos/$REPO_LNK --jq '.default_branch')
+          REPO_DATE=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.commit.committer.date')
+          BUILD_DATE=$( date --utc +'%Y%m%d' )
+          FW_DATE=$( date --utc +'%Y-%m-%d' )
           {
             echo "tag=$GITHUB_REF_NAME"
-            echo "date=$(date --utc -d $DATE +%Y%m%d)"
-            echo "sha=$(gh api repos/$REPO/commits/$BRANCH --jq '.sha[0:7]')"
-            echo "url=$(gh api repos/$REPO/commits/$BRANCH --jq '.html_url')"
+            echo "date=$(date --utc -d $REPO_DATE +%Y%m%d)"
+            echo "sha=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.sha[0:7]')"
+            echo "url=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.html_url')"
             echo "message<<EOF"
-            gh api repos/$REPO/commits/$BRANCH --jq '.commit.message'
+            gh api repos/$REPO_LNK/commits/$BRANCH --jq '.commit.message'
             echo EOF
+            echo "build_date=$BUILD_DATE"
+            echo "fw_date=$FW_DATE"
           } >> $GITHUB_OUTPUT
-          echo "DATE=$DATE" >> $GITHUB_ENV
+          echo "REPO_DATE=$REPO_DATE" >> $GITHUB_ENV
 
       - name: Check for repo activity
         id: activity
         env:
-          DATE: ${{ env.DATE }}
+          REPO_DATE: ${{ env.REPO_DATE }}
           URL: ${{ steps.gh.outputs.url }}
         run: |
-          TIMESTAMP=$(date --utc -d $DATE +%s)
+          TIMESTAMP=$(date --utc -d $REPO_DATE +%s)
           DAYS=$(( ( $(date --utc +%s) - $TIMESTAMP ) / 86400 ))
-          echo "Repository activity: $(date --utc -d $DATE)"
+          echo "Repository activity: $(date --utc -d $REPO_DATE)"
           echo "Commit: $URL"
           if [ "${{ github.event_name }}" != "schedule" ]; then
             is_active=true
@@ -63,9 +96,9 @@ jobs:
     #if: needs.check.outputs.is_active == 'true'
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        #branch: [ openwrt-22.03, openwrt-23.05 ]
-        branch: [ openwrt-23.05 ]
+        branch: [ openwrt-23.05, SNAPSHOT ]
         arch:
           - aarch64_cortex-a53
           - aarch64_cortex-a72
@@ -93,135 +126,198 @@ jobs:
           - mipsel_74kc
           - mipsel_mips32
           - x86_64
-        #include:
-        #  - branch: SNAPSHOT
-        #    arch: x86_64
-        #exclude:
-        #  - branch: openwrt-22.03
-        #    arch: arm_fa526
-        #  - branch: openwrt-22.03
-        #    arch: arm_mpcore
+        isFake:
+          - ${{ github.event.inputs.fake_build == 'true' }}        
+        exclude:
+          - branch: SNAPSHOT
+            arch: arm_mpcore
+          - branch: SNAPSHOT
+            arch: arm_cortex-a9_vfpv3-d16
+          - { isFake: true }
+        include:
+          - branch: openwrt-23.05
+            arch: x86_64
+          - branch: openwrt-23.05
+            arch: aarch64_cortex-a53
+          - branch: SNAPSHOT
+            arch: aarch64_cortex-a53
+          - branch: SNAPSHOT
+            arch: aarch64_cortex-a76
     container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
       options: --user root
+    outputs:
+      pkgver: ${{ steps.build.outputs.pkgver }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          repository: 'remittor/zapret-openwrt'
+          repository: ${{ env.REPO_LNK }}
           path: zapret-openwrt
 
+      - name: Setup OpenWrt SDK
+        working-directory: /builder
+        env:
+          BRANCH: ${{ matrix.branch }}
+        shell: bash
+        run: |
+          # gpg --verbose --recv-keys 0x1D53D1877742E911
+          gpg --verbose --import <(wget -qO- 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/0x1D53D1877742E911.asc')
+          # disable check signatures
+          sed -i 's/gpg --/#gpg --/g' setup.sh
+          # disable cleanup keys
+          sed -r -i 's/^rm.+//' setup.sh
+          ./setup.sh
+          ls -lh
+          if [ "$BRANCH" = "openwrt-23.05" ]; then
+              echo "PKGTYPE=ipk" >> $GITHUB_ENV
+          else
+              echo "PKGTYPE=apk" >> $GITHUB_ENV
+          fi
+
       - name: Setup ccache
         uses: actions/cache@v4
         with:
-          path: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt/.ccache' || '/builder/.ccache' }}
+          path: '/builder/.ccache'
           key: ccache-${{ matrix.arch }}-${{ matrix.branch }}-${{ github.run_id }}
           restore-keys: |
             ccache-${{ matrix.arch }}-${{ matrix.branch }}-
 
       - name: Build packages
         id: build
-        working-directory: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt' || '/builder' }}
+        working-directory: '/builder'
         env:
+          MAX_SPEED: ${{ github.event.inputs.max_speed != 'false' }}
+          BUILD_DATE: ${{ needs.check.outputs.build_date }}
           DATE: ${{ needs.check.outputs.date }}
           SHA: ${{ needs.check.outputs.sha }}
           ARCH: ${{ matrix.arch }}
           BRANCH: ${{ matrix.branch }}
           SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
-          CCACHE_DIR: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt/.ccache' || '/builder/.ccache' }}
+          CCACHE_DIR: '/builder/.ccache'
         shell: bash
         run: |
-          #export PKG_VERSION=$(date --utc -d $DATE +%Y%m%d)
-          #find $GITHUB_WORKSPACE/zapret-openwrt -type d -path '*/package/zapret' -exec cp -r {} ./package \;
-          cp -r $GITHUB_WORKSPACE/zapret-openwrt ./package/zapret-openwrt/
+          MAKE_JOBS=$(($(nproc)+1))
+          echo "$MAKE_JOBS thread compile"
+          PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt
+          MKFN=$PKGDIR/luci-app-zapret/Makefile
+          PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 )
+          echo "PKG_VERSION = $PKGVER"
+          cp -vr $PKGDIR ./package/zapret-openwrt/
           
           mv feeds.conf.default feeds.conf
           sed -i -e 's|base.*\.git|base https://github.com/openwrt/openwrt.git|' feeds.conf
           sed -i -e 's|packages.*\.git|packages https://github.com/openwrt/packages.git|' feeds.conf
           sed -i -e 's|luci.*\.git|luci https://github.com/openwrt/luci.git|' feeds.conf
+          mkdir -p ./logs
           
-          ./scripts/feeds update base packages luci
-          ./scripts/feeds install -a
+          if [ "$FAKE_BUILD" != "true" ]; then
+              ./scripts/feeds update base packages luci
+              ./scripts/feeds install -a
+              make defconfig
+              echo "------------- .config BEG -------------------"
+              cat .config
+              echo "------------- .config END -------------------"
+              if [ "$ARCH" = "$LUCI_ARCH" ]; then
+                  PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
+              else
+                  PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net}/compile`
+              fi
+              if [ "$MAX_SPEED" = "false" ]; then
+                  make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
+              else
+                  make -j$MAKE_JOBS $PKGLIST CONFIG_CCACHE=1
+              fi
+          else
+              OUT_DIR=./bin/packages/dev_x/base
+              mkdir -p $OUT_DIR
+              touch $OUT_DIR/zapret_$PKGVER-$ARCH.$PKGTYPE
+              touch $OUT_DIR/luci-app-zapret_$PKGVER-all.$PKGTYPE
+          fi
           
-          make defconfig
-          echo "------------- .config BEG -------------------"
-          cat .config
-          echo "------------- .config END -------------------"
-          
-          PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
-          make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
-          
-          find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.ipk$" -delete
+          find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.[ai]pk$" -delete
           
           #echo ">>>>>>> build a repository index to make the output directory usable as local OPKG source"
           #ln -s `which usign` staging_dir/host/bin/usign
           #echo "$SIGN_KEY" | base64 -d > key-build
           #make package/index
           
-          tar -C ./bin/packages/*/base -cvf $GITHUB_WORKSPACE/ipk-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
+          OUTDIR=$GITHUB_WORKSPACE/$PKGTYPE-$ARCH
+          mkdir -p $OUTDIR
+          cp -R ./bin/packages/*/base/. $OUTDIR/
           ./staging_dir/host/bin/ccache --max-size=10M --show-stats
+          
+          echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
+          echo "PKGVER=$PKGVER" >> $GITHUB_ENV
+          echo "pkgver=$PKGVER" >> $GITHUB_OUTPUT
 
       - name: Compress build logs
         if: always()
         env:
           ARCH: ${{ matrix.arch }}
           BRANCH: ${{ matrix.branch }}
-          LOGS_DIR: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt/logs' || '/builder/logs' }}
+          LOGS_DIR: '/builder/logs'
         run: |
           tar -cJvf logs-$BRANCH-$ARCH.tar.xz $LOGS_DIR
 
       - name: Upload packages
         if: steps.build.outcome == 'success'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@main
         with:
-          name: ipk-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/ipk-${{ matrix.branch }}-${{ matrix.arch }}.tar
+          path: ${{ env.OUTDIR }}
+          name: zapret,${{ env.PKGTYPE }},${{ matrix.arch }}
           if-no-files-found: error
 
       - name: Upload build logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
+          path: logs-*.tar.xz
           name: logs-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/logs-*.tar.xz
 
   release:
     needs: [ check, build ]
     permissions:
       contents: write
     runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 1
-      matrix:
-        #branch: [ '22.03', '23.05' ]
-        branch: [ '23.05' ]
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: ipk-*
+          pattern: zapret,*
 
-      - name: Put ipk into zip
+      - name: Put packages into zip
         env:
-          BRANCH: ${{ matrix.branch }}
           TAG: ${{ needs.check.outputs.tag }}
           DATE: ${{ needs.check.outputs.date }}
+          BUILD_DATE: ${{ needs.check.outputs.build_date }}
+          PKGVER: ${{ needs.build.outputs.pkgver }}
         run: |
+          echo "------------- DIR BEG -------------------"
+          ls -la
+          echo "------------- DIR END -------------------"
+          mkdir -p sorted
+          find . -maxdepth 1 -type d -name "zapret,ipk,*" -exec sh -c 'mkdir -p sorted/$(basename "{}" | cut -d, -f3)' \;
+          find . -maxdepth 1 -type d -name "zapret,apk,*" -exec sh -c 'mkdir -p sorted/$(basename "{}" | cut -d, -f3)/apk' \;
+          find . -maxdepth 1 -type d -name "zapret,ipk,*" -exec sh -c 'cp -R "{}/." sorted/$(basename "{}" | cut -d, -f3)' \;
+          find . -maxdepth 1 -type d -name "zapret,apk,*" -exec sh -c 'cp -R "{}/." sorted/$(basename "{}" | cut -d, -f3)/apk' \;
+          LUCI_IPK=$( find . -type f -path "*/zapret,ipk,*/luci-app-zapret*.ipk" -print | head -n 1 )
+          LUCI_APK=$( find . -type f -path "*/zapret,apk,*/luci-app-zapret*.apk" -print | head -n 1 )
+          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec cp -f "$LUCI_IPK" "{}/" \;
+          find ./sorted -mindepth 2 -maxdepth 2 -type d -name "apk" -exec cp -f "$LUCI_APK" "{}/" \;
           mkdir -p public
-          find . -name "ipk-openwrt-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.ipk' \;
-          find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/zapret_${TAG}_$(basename {}).zip -j {} {}/*' \;
+          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec sh -c '7z a ./public/zapret_v${PKGVER}_$(basename "{}" | cut -d, -f3).zip {}/*' \;
           ls -lh ./public/*.zip
 
       - name: Upload assets
         uses: andelf/nightly-release@main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: ${{ matrix.branch }}
           TAG: ${{ needs.check.outputs.tag }}
         with:
-          prerelease: false
-          tag_name: ${{ needs.check.outputs.tag }}-${{ matrix.branch }}
-          name: '${{ needs.check.outputs.tag }} for OpenWrt ${{ matrix.branch }}'
+          prerelease: ${{ github.event.inputs.fake_build == 'true' }}
+          tag_name: v${{ needs.build.outputs.pkgver }}${{ github.event.inputs.fake_build == 'true' && '-fake' || '' }}
+          name: zapret v${{ needs.build.outputs.pkgver }}
           body: |
-            ${{ needs.check.outputs.url }}: ${{ needs.check.outputs.message }}
+            zapret v${{ needs.build.outputs.pkgver }} for OpenWrt
           files: ./public/*.zip

README.md

@@ -1,6 +1,19 @@
-[![build](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml/badge.svg)](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml)
+[![build](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml/badge.svg)](https://github.com/remittor/zapret-openwrt/releases)  [![Github All Releases](https://img.shields.io/github/downloads/remittor/zapret-openwrt/total.svg)](https://github.com/remittor/zapret-openwrt/releases)
 # zapret-openwrt
 
+Zapret is not a VPN! Zapret is an Anti-DPI utility!
+
 [Instructions for installing](https://github.com/remittor/zapret-openwrt/wiki/Installing-zapret‐openwrt-package)
 
 [Download page](https://github.com/remittor/zapret-openwrt/releases)
+
+## Screenshots
+
+![image](https://github.com/user-attachments/assets/b79940b3-6a0d-4310-bd58-e461be004397)
+
+## Donations
+
+<img src=https://cdn-icons-png.flaticon.com/16/14446/14446252.png alt="USDT" style="vertical-align: middle;"/> USDT (ethereum network)
+```
+0x840E78D3E47A7ed4987bc36b4A4f0C5240bd7DE8
+```

luci-app-zapret/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret
-PKG_RELEASE:=20241025
-PKG_VERSION:=65-$(PKG_RELEASE)
+PKG_VERSION:=70.20250116
 PKG_LICENSE:=MIT
+PKG_MAINTAINER:=remittor <https://github.com/remittor>
 
 LUCI_TITLE:=LuCI support for zapret
 LUCI_DEPENDS:=+zapret
@@ -20,8 +20,8 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	rm -rf /tmp/luci-modulecache/
 	#killall -HUP rpcd 2>/dev/null
 	/etc/init.d/rpcd reload
-	/sbin/luci-reload
-	/etc/init.d/uhttpd reload
+	[ -f "/sbin/luci-reload" ] && /sbin/luci-reload
+	[ -f "/etc/init.d/uhttpd" ] && /etc/init.d/uhttpd reload
 fi
 exit 0
 endef

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

@@ -22,10 +22,15 @@ return view.extend({
             restart : elems.btn_restart || document.getElementById('btn_restart'),
             stop    : elems.btn_stop    || document.getElementById('btn_stop'),
             update  : elems.btn_update  || document.getElementById('btn_update'),
+            reset   : elems.btn_update  || document.getElementById('btn_reset'),
         };
     },
     
     disableButtons: function(flag, button, elems = { }) {
+        let error_code = 0;
+        if (Number.isInteger(button) && button < 0) {
+            error_code = button;
+        }
         let btn = this.get_svc_buttons(elems);
         btn.enable.disabled  = flag;
         btn.disable.disabled = flag;
@@ -33,14 +38,16 @@ return view.extend({
         btn.restart.disabled = flag;
         btn.stop.disabled    = flag;
         btn.update.disabled  = true; // TODO
+        btn.reset.disabled   = (error_code == 0) ? flag : false;
     },
 
     getAppStatus: function() {
         return Promise.all([
-            tools.getInitState(tools.appName),    // svc_state
-            fs.exec(tools.execPath, [ 'info' ]),  // svc_info
-            fs.exec('/bin/ps'),                   // process list
-            fs.exec('/bin/opkg', [ 'list-installed', '*zapret*' ]),  // installed packages
+            tools.getInitState(tools.appName),      // svc_boot
+            fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
+            fs.exec(tools.execPath, [ 'info' ]),    // svc_info
+            fs.exec('/bin/busybox', [ 'ps' ]),      // process list
+            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
             uci.load(tools.appName),              // config
         ]).catch(e => {
             ui.addNotification(null, E('p', _('Unable to execute or read contents')
@@ -56,45 +63,51 @@ return view.extend({
             let elem_status = elems.status || document.getElementById("status");
             elem_status.innerHTML = tools.makeStatusString(null);
             ui.addNotification(null, E('p', _('Unable to read the contents') + ': setAppStatus()'));
-            this.disableButtons(true, null, elems);
+            this.disableButtons(true, -1, elems);
             return;
         }
-        let svc_autorun = status_array[0] ? true : false;
-        let svc_info = status_array[1];   // stdout: JSON as text
-        let proc_list = status_array[2];  // stdout: multiline text
-        let pkg_list = status_array[3];   // stdout: installed packages
+        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 proc_list = status_array[3];   // stdout: multiline text
+        let pkg_list  = status_array[4];   // stdout: installed packages
+        
+        //console.log('svc_en: ' + svc_en.code);
+        svc_en = (svc_en.code == 0) ? true : false;
+        
         if (svc_info.code != 0) {
             ui.addNotification(null, E('p', _('Unable to read the service info') + ': setAppStatus()'));
-            this.disableButtons(true, null, elems);
+            this.disableButtons(true, -1, elems);
             return;
         }
         if (proc_list.code != 0) {
             ui.addNotification(null, E('p', _('Unable to read process list') + ': setAppStatus()'));
-            this.disableButtons(true, null, elems);
+            this.disableButtons(true, -1, elems);
             return;
         }
         if (pkg_list.code != 0) {
             ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
-            this.disableButtons(true, null, elems);
+            this.disableButtons(true, -1, elems);
             return;
         }
         let svcinfo;
         if (force_app_status) {
             svcinfo = force_app_status;
         } else {
-            svcinfo = tools.decode_svc_info(svc_autorun, svc_info, proc_list, cfg);
+            svcinfo = tools.decode_svc_info(svc_en, svc_info, proc_list, cfg);
         }
         let btn = this.get_svc_buttons(elems);
         btn.update.disabled = true;   // TODO
+        btn.reset.disabled = false;
 
         if (Number.isInteger(svcinfo)) {
             ui.addNotification(null, E('p', _('Error')
                 + ' %s: return code = %s'.format('decode_svc_info', svcinfo + ' ')));
-            this.disableButtons(true, null, elems);
+            this.disableButtons(true, -1, elems);
         } else {
-            btn.enable.disabled  = (svc_autorun) ? true : false;
-            btn.disable.disabled = (svc_autorun) ? false : true;
-            if (svcinfo.dmn.total == 0) {
+            btn.enable.disabled  = (svc_en) ? true : false;
+            btn.disable.disabled = (svc_en) ? false : true;
+            if (!svcinfo.dmn.inited) {
                 btn.start.disabled = false;
                 btn.restart.disabled = true;
                 btn.stop.disabled = true;
@@ -134,7 +147,7 @@ return view.extend({
         });
     },
 
-    serviceActionEx: function(action, button) {
+    serviceActionEx: function(action, button, hide_modal = false) {
         if (button) {
             let elem = document.getElementById(button);
             this.disableButtons(true, elem);
@@ -142,11 +155,32 @@ return view.extend({
         poll.stop();
         
         let _this = this;
-        
-        return fs.exec(tools.syncCfgPath)
+        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 = [ 'sync' ];  // restore config + sync configs
+            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', _('Unable to run sync_config.sh script.') + ' res.code = ' + res.code));
+                ui.addNotification(null, E('p', errmsg + ' res.code = ' + res.code));
+                action = null;  // return with error
+            }
+            if (hide_modal) {
+                ui.hideModal();
+            }
+            if (!action) {
                 return _this.getAppStatus().then(
                     (status_array) => {
                         _this.setAppStatus(status_array);
@@ -156,7 +190,7 @@ return view.extend({
             return _this.serviceAction(action, null);
         })
         .catch(e => { 
-            ui.addNotification(null, E('p', _('Unable to run sync_config.sh script.') + ' Error: ' + e.message));
+            ui.addNotification(null, E('p', errmsg + ' Error: ' + e.message));
         });
     },
 
@@ -192,29 +226,29 @@ return view.extend({
         );
     },
 
-    dialogDestroy: function(ev) {
+    dialogResetCfg: function(ev) {
         ev.target.blur();
         let cancel_button = E('button', {
             'class': btn_style_neutral,
             'click': ui.hideModal,
         }, _('Cancel'));
 
-        let shutdown_btn = E('button', {
-            'class': btn_style_warning,
-        }, _('Shutdown'));
-        shutdown_btn.onclick = ui.createHandlerFn(this, () => {
-            cancel_button.disabled = true;
-            return this.appAction('destroy');
+        let resetcfg_btn = E('button', {
+            'class': btn_style_action,
+        }, _('Reset settings'));
+        resetcfg_btn.onclick = ui.createHandlerFn(this, () => {
+            //cancel_button.disabled = true;
+            return this.serviceActionEx('reset', resetcfg_btn, true);
         });
 
-        ui.showModal(_('Shutdown'), [
+        ui.showModal(_('Reset settings to default'), [
             E('div', { 'class': 'cbi-section' }, [
-                E('p', _('The service will be disabled. Continue?')),
+                E('p', _('All settings will be reset to default. Continue?')),
             ]),
             E('div', { 'class': 'right' }, [
-                shutdown_btn,
-                ' ',
                 cancel_button,
+                ' ',
+                resetcfg_btn,
             ])
         ]);
     },
@@ -229,7 +263,7 @@ return view.extend({
         }
         let cfg = uci.get(tools.appName, 'config');
 
-        let pkg_list = status_array[3];
+        let pkg_list = status_array[4];
         if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
             ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
             return;
@@ -294,8 +328,9 @@ return view.extend({
         btn_update.onclick  = ui.createHandlerFn(this, () => { this.appAction('update', 'btn_update') });
         layout_append(_('Update blacklist'), null, [ btn_update ] );
         
-        let btn_destroy     = create_btn('btn_destroy', btn_style_negative, _('Shutdown'));
-        btn_destroy.onclick = L.bind(this.dialogDestroy, this);
+        let btn_reset       = create_btn('btn_reset', btn_style_action, _('Reset settings'));
+        btn_reset.onclick   = L.bind(this.dialogResetCfg, this);
+        layout_append(_('Reset settings to default'), null, [ btn_reset ] );
 
         let elems = {
             "status": status_string,
@@ -305,6 +340,7 @@ return view.extend({
             "btn_restart": btn_restart,
             "btn_stop": btn_stop,
             "btn_update": btn_update,
+            "btn_reset": btn_reset,
         };
         this.setAppStatus(status_array, elems);
 

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

@@ -64,10 +64,10 @@ return view.extend({
         //o.value('iptables', 'iptables');
         //o.value('ipfw',     'ipfw');
 
-        o = s.taboption(tabname, form.ListValue, 'MODE', _('MODE'));
-        o.value('nfqws',   'nfqws');
-        //o.value('tpws',    'tpws');
-        
+        o = s.taboption(tabname, form.Flag, 'POSTNAT', _('POSTNAT'));
+        o.rmempty = false;
+        o.default = 1;
+
         o = s.taboption(tabname, form.ListValue, 'FLOWOFFLOAD', _('FLOWOFFLOAD'));
         o.value('donttouch', 'donttouch');
         o.value('none',      'none');
@@ -92,44 +92,6 @@ return view.extend({
         o.value('hostlist',     'hostlist');
         o.value('autohostlist', 'autohostlist');
 
-        o = s.taboption(tabname, form.Flag, 'MODE_HTTP', _('MODE_HTTP'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Flag, 'MODE_HTTP_KEEPALIVE', _('MODE_HTTP_KEEPALIVE'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Value, 'HTTP_PORTS', _('HTTP_PORTS'));
-        o.rmempty     = false;
-        o.datatype    = 'string';
-
-        o = s.taboption(tabname, form.Flag, 'MODE_HTTPS', _('MODE_HTTPS'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Value, 'HTTPS_PORTS', _('HTTPS_PORTS'));
-        o.rmempty     = false;
-        o.datatype    = 'string';
-
-        o = s.taboption(tabname, form.Flag, 'MODE_QUIC', _('MODE_QUIC'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Value, 'QUIC_PORTS', _('QUIC_PORTS'));
-        o.rmempty     = false;
-        o.datatype    = 'string';
-
-        o = s.taboption(tabname, form.Value, 'DESYNC_MARK', _('DESYNC_MARK'));
-        //o.description = _("nfqws option for DPI desync attack");
-        o.rmempty     = false;
-        o.datatype    = 'string';
-
-        o = s.taboption(tabname, form.Value, 'DESYNC_MARK_POSTNAT', _('DESYNC_MARK_POSTNAT'));
-        //o.description = _("nfqws option for DPI desync attack");
-        o.rmempty     = false;
-        o.datatype    = 'string';
-
         /* NFQWS_OPT_DESYNC tab */
 
         tabname = 'nfqws_params';
@@ -141,67 +103,154 @@ return view.extend({
             o.default = '<hr style="width: 620px; height: 1px; margin: 1px 0 1px; border-top: 1px solid;">';
         };
 
-        let add_param = function(sec, param, locname = null, rows = 10) {
+        let add_param = function(sec, param, locname = null, rows = 10, multiline = false) {
             if (!locname)
                 locname = param;
             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);
-            val.rawhtml = false;
+            val.rawhtml = multiline ? true : false;
             val.cfgvalue = function(section_id) {
-                let name = uci.get(tools.appName, section_id, param);
-                if (name == null || name == "")
-                    name = "";
-                return name;
+                let value = uci.get(tools.appName, section_id, param);
+                if (value == null) {
+                    return "";
+                }
+                value = value.trim();
+                if (multiline == 2) {
+                    value = value.replace(/\n  --/g, "\n--");
+                    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) {
-                if (!value)
-                    return "";
-                return value.trim();
+                return (value) ? value.trim() : "";
             };
-            btn.onclick = () => new tools.longstrEditDialog('config', param, param, locname, rows).show();
+            btn.onclick = () => new tools.longstrEditDialog('config', param, param, locname, rows, multiline).show();
         };
 
+        o = s.taboption(tabname, form.Flag, 'NFQWS_ENABLE', _('NFQWS_ENABLE'));
+        o.rmempty = false;
+        o.default = 1;
+
+        o = s.taboption(tabname, form.Value, 'DESYNC_MARK', _('DESYNC_MARK'));
+        //o.description = _("nfqws option for DPI desync attack");
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'DESYNC_MARK_POSTNAT', _('DESYNC_MARK_POSTNAT'));
+        //o.description = _("nfqws option for DPI desync attack");
+        o.rmempty     = false;
+        o.datatype    = 'string';
+        
+        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP', _('NFQWS_PORTS_UDP'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        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, 'NFQWS_TCP_PKT_IN', _('NFQWS_TCP_PKT_IN'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        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, 'NFQWS_UDP_PKT_IN', _('NFQWS_UDP_PKT_IN'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        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, 'NFQWS_PORTS_UDP_KEEPALIVE', _('NFQWS_PORTS_UDP_KEEPALIVE'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
         add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP6');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP6_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS6');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS6_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC6');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC6_SUFFIX');
+        add_param(s, 'NFQWS_OPT', null, 18, 2);
+
+        /* AutoHostList settings */
+
+        tabname = 'autohostlist_tab'; 
+        s.tab(tabname, _('AutoHostList'));
+        
+        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_THRESHOLD', _('RETRANS_THRESHOLD'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
+        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_FAIL_THRESHOLD', _('FAIL_THRESHOLD'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
+        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_FAIL_TIME', _('FAIL_TIME'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
+        o = s.taboption(tabname, form.Button, '_auto_host_btn', _('Auto host list entries'));
+        o.inputtitle = _('Edit');
+        o.inputstyle = 'edit btn';
+        o.description = tools.autoHostListFN;
+        o.onclick = () => new tools.fileEditDialog(
+            tools.autoHostListFN,
+            _('Auto host list'),
+            '',
+            '',
+            15
+        ).show();
+
+        o = s.taboption(tabname, form.Flag, 'AUTOHOSTLIST_DEBUGLOG', _('DEBUGLOG'));
+        o.rmempty     = false;
+        o.default     = 0;
+
+        o = s.taboption(tabname, form.Button, '_auto_host_debug_btn', _('Auto host debug list entries'));
+        o.inputtitle = _('Edit');
+        o.inputstyle = 'edit btn';
+        o.description = tools.autoHostListDbgFN;
+        o.onclick = () => new tools.fileEditDialog(
+            tools.autoHostListDbgFN,
+            _('Auto host debug list'),
+            '',
+            '',
+            15
+        ).show();
         
         /* Blacklist settings */
 
         tabname = 'blacklist_tab'; 
         s.tab(tabname, _('Blacklist settings'));
 
+        o = s.taboption(tabname, form.Button, '_google_entries_btn', _('Google hostname entries'));
+        o.inputtitle = _('Edit');
+        o.inputstyle = 'edit btn';
+        o.description = tools.hostsGoogleFN;
+        o.onclick = () => new tools.fileEditDialog(
+            tools.hostsGoogleFN,
+            _('Google hostname entries'),
+            _('One hostname per line.<br />Examples:'),
+            '<code>youtube.com<br />googlevideo.com</code>',
+            15
+        ).show();
+
         o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserFN;
-        o.onclick = () => new tools.fileEditDialog(            
+        o.onclick = () => new tools.fileEditDialog(
             tools.hostsUserFN,
             _('User entries'),
             _('One hostname per line.<br />Examples:'),
@@ -213,7 +262,7 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(            
+        o.onclick = () => new tools.fileEditDialog(
             tools.hostsUserExcludeFN,
             _('User excluded entries'),
             _('One hostname per line.<br />Examples:'),
@@ -271,6 +320,23 @@ return view.extend({
             o.onclick = () => new tools.fileEditDialog(fn, name, '', '', 15).show();
         }
 
+        /* custom.d files */
+
+        tabname = 'custom_d_tab'; 
+        s.tab(tabname, 'custom.d');
+        
+        for (let i = 0; i < tools.customdPrefixList.length; i++) {
+            let num = tools.customdPrefixList[i];
+            let fn = tools.customdFileFormat.format(num.toString());
+            let name = _('custom.d script #' + num);
+            o = s.taboption(tabname, form.Button, '_customd_file%d_btn'.format(num), name);
+            o.inputtitle = _('Edit');
+            o.inputstyle = 'edit btn';
+            o.description = fn;
+            let desc = (num == tools.discord_num) ? _('Example') + ': <a href=%s>%s</a>'.format(tools.discord_url) : '';
+            o.onclick = () => new tools.fileEditDialog(fn, name, desc, '', 15).show();
+        }
+
         let map_promise = m.render();
         map_promise.then(node => node.classList.add('fade-in'));
         return map_promise;

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

@@ -35,10 +35,13 @@ document.head.append(E('style', {'type': 'text/css'},
 `));
 
 return baseclass.extend({
+    packager          : null,
     appName           : 'zapret',
     execPath          : '/etc/init.d/zapret',
     syncCfgPath       : '/opt/zapret/sync_config.sh',
+    defaultCfgPath    : '/opt/zapret/restore-def-cfg.sh',
 
+    hostsGoogleFN     : '/opt/zapret/ipset/zapret-hosts-google.txt',
     hostsUserFN       : '/opt/zapret/ipset/zapret-hosts-user.txt',
     hostsUserExcludeFN: '/opt/zapret/ipset/zapret-hosts-user-exclude.txt',
     iplstExcludeFN    : '/opt/zapret/ipset/zapret-ip-exclude.txt',
@@ -46,6 +49,13 @@ return baseclass.extend({
     iplstUserExcludeFN: '/opt/zapret/ipset/zapret-ip-user-exclude.txt',
     custFileMax       : 4,
     custFileTemplate  : '/opt/zapret/ipset/cust%s.txt',
+    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
+    customdFileFormat : '/opt/zapret/init.d/openwrt/custom.d/%s-script.sh',
+    discord_num       : 50,
+    discord_url       : 'https://github.com/bol-van/zapret/blob/master/init.d/custom.d.examples.linux/50-discord',
+
+    autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
+    autoHostListDbgFN : '/opt/zapret/ipset/zapret-hosts-auto-debug.log',
 
     infoLabelRunning  : '<span class="label-status running">'  + _('Running')  + '</span>',
     infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
@@ -77,7 +87,24 @@ 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', '*zapret*' ];
+            } else {
+                this.packager.name = 'opkg';
+                this.packager.path = '/bin/opkg';
+                this.packager.args = [ 'list-installed', '*zapret*' ];
+            }
+            //console.log('PACKAGER: ' + this.packager.name);
+        }
+    },
+
     getInitState: function(name) {
+        this.init_consts();
         return this.callInitState(name).then(res => {
             if (res) {
                 return res[name].enabled ? true : false;
@@ -109,12 +136,33 @@ return baseclass.extend({
         let lines = pkg_list.trim().split('\n');
         for (let i = 0; i < lines.length; i++) {
             let line = lines[i].trim();
-            if (line.length >= 4) {
-                let word_list = line.split(' - ');
-                let name = word_list[0].trim();
-                let ver = word_list[1].trim();
-                pkg_dict[name] = ver;
+            let name;
+            let ver;
+            if (this.packager.name == 'apk') {
+                let fullname = line.split(' ')[0];
+                let mpos = fullname.lastIndexOf("-");
+                if (mpos <= 0)
+                    continue;
+                if (fullname.substring(mpos+1, mpos+2) == 'r') {
+                    // release number
+                    fullname = fullname.substring(0, mpos);
+                }
+                mpos = fullname.lastIndexOf("-");
+                if (mpos <= 0)
+                    continue;
+                name = fullname.substring(0, mpos).trim();
+                ver = fullname.substring(mpos+1).trim();
+            } else {
+                if (!line.includes(' - '))
+                    continue;
+                name = line.split(' - ')[0].trim();
+                ver  = line.split(' - ')[1].trim();
+                let spos = ver.indexOf(" ");
+                if (spos > 0) {
+                    ver = ver.substring(0, spos);
+                }
             }
+            pkg_dict[name] = ver;
         }
         return pkg_dict;
     },
@@ -140,6 +188,7 @@ return baseclass.extend({
         let result = {
             "autorun": svc_autorun,
             "dmn": {
+                inited: false,
                 total: 0,
                 running: 0,
                 working: 0,
@@ -154,23 +203,38 @@ return baseclass.extend({
         }        
         let plist = this.get_pid_list(proc_list.stdout);
         
-        let jdata = JSON.parse(svc_info.stdout);
-        if (typeof(jdata) !== 'object') {
+        if (plist.length < 4) {
             return -3;
         }
+        if (typeof(svc_info.stdout) !== 'string') {
+            return -4;
+        }
+        if (svc_info.stdout.length < 3) {
+            return -5;
+        }
+        let jdata;
+        try {
+            jdata = JSON.parse(svc_info.stdout);
+        } catch (e) {
+            console.log('Incorrect JSON: ' + svc_info.stdout);
+            return -6;
+        }
+        if (typeof(jdata) !== 'object') {
+            return -7;
+        }
         if (typeof(jdata.zapret) == 'object') {
+            result.dmn.inited = true;
             let dmn_list = jdata.zapret.instances;
-            if (typeof(dmn_list) !== 'object') {
-                return -4;
-            }
-            for (const [dmn_name, daemon] of Object.entries(dmn_list)) {
-                result.dmn.total += 1;
-                if (daemon.running) {
-                    result.dmn.running += 1;
-                }
-                if (daemon.pid !== undefined && daemon.pid != null) {
-                    if (plist.includes(daemon.pid)) {
-                        result.dmn.working += 1;
+            if (typeof(dmn_list) == 'object') {
+                for (const [dmn_name, daemon] of Object.entries(dmn_list)) {
+                    result.dmn.total += 1;
+                    if (daemon.running) {
+                        result.dmn.running += 1;
+                    }
+                    if (daemon.pid !== undefined && daemon.pid != null) {
+                        if (plist.includes(daemon.pid)) {
+                            result.dmn.working += 1;
+                        }
                     }
                 }
             }
@@ -179,7 +243,7 @@ return baseclass.extend({
         if (result.dmn.total == 0) {
             result.status = (!svc_autorun) ? this.statusDict.disabled : this.statusDict.stopped;
         } else {
-            result.status = (!result.dmn.working) ? this.statusDict.started : this.statusDict.running;
+            result.status = (result.dmn.inited) ? this.statusDict.started : this.statusDict.running;
         }
         return result;
     },
@@ -190,7 +254,7 @@ return baseclass.extend({
         
         if (typeof(svcinfo) == 'object') {
             svc_autorun = (svcinfo.autorun) ? _('Enabled') : _('Disabled');
-            if (svcinfo.dmn.total == 0) {
+            if (!svcinfo.dmn.inited) {
                 svc_daemons = _('Stopped');
             } else {
                 svc_daemons = (!svcinfo.dmn.working) ? _('Starting') : _('Running');
@@ -346,18 +410,24 @@ return baseclass.extend({
     }),
 
     longstrEditDialog: baseclass.extend({
-        __init__: function(cfgsec, cfgparam, title, desc, rows = 10) {
+        __init__: function(cfgsec, cfgparam, title, desc, rows = 10, multiline = false) {
             this.cfgsec      = cfgsec;
             this.cfgparam    = cfgparam;
             this.title       = title;
             this.desc        = desc;
             this.rows        = rows;
+            this.multiline   = multiline;
         },
 
         load: function() {
             let value = uci.get('zapret', this.cfgsec, this.cfgparam);
             if (typeof(value) === 'string') {
-                return value.trim();
+                value = value.trim();
+                if (this.multiline == 2) {
+                    value = value.replace(/\n  --/g, "\n--");
+                    value = value.replace(/\n --/g, "\n--");
+                    value = value.replace(/ --/g, "\n--");
+                }
             }
             return value;
         },
@@ -397,15 +467,40 @@ return baseclass.extend({
 
         handleSave: function(ev) {
             let txt = document.getElementById('widget.modal_content');
-            let value = txt.value.trim().replace(/\r\n/g, ' ').replace(/\r/g, ' ').replace(/\n/g, ' ').trim();
+            let value = txt.value.trim();
+            if (this.multiline) {
+                value = value.replace(/\r/g, '');
+                if (value != "" && value != "\t") {
+                    value = '\n' + value + '\n';
+                    if (this.multiline == 2) {
+                        value = value.replace(/"/g, '');
+                        value = value.replace(/'/g, '');
+                    }
+                }
+            } else {
+                value = value.replace(/\r\n/g, ' ');
+                value = value.replace(/\r/g, ' ');
+                value = value.replace(/\n/g, ' ');
+                value = value.trim();
+            }
             if (value == "") {
                 value = "\t";
             }
+            value = value.replace(/˂/g, '<');
+            value = value.replace(/˃/g, '>');
             uci.set('zapret', this.cfgsec, this.cfgparam, value);
             uci.save();
             let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
             if (elem) {
-                elem.querySelector('div').textContent = value;
+                let val = value.trim();
+                if (this.multiline) {
+                    val = val.replace(/</g, '˂');
+                    val = val.replace(/>/g, '˃');
+                    val = val.replace(/\n/g, '<br/>');
+                    elem.querySelector('div').innerHTML = val;
+                } else {
+                    elem.querySelector('div').textContent = val;
+                }
             }
             ui.hideModal();
             /*

luci-app-zapret/root/usr/share/luci/menu.d/luci-app-zapret.json

@@ -10,6 +10,7 @@
 			"acl": [ "luci-app-zapret" ],
 			"fs": {
 				"/opt/zapret/sync_config.sh": "executable",
+				"/opt/zapret/restore-def-cfg.sh": "executable",
 				"/etc/init.d/zapret": "executable"
 			},
 			"uci": { "zapret": true }

luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json

@@ -9,7 +9,10 @@
 				"/etc/crontabs/root": [ "read" ],
 				"/etc/init.d/zapret*": [ "exec" ],
 				"/bin/ps*": [ "exec" ],
+				"/bin/busybox*": [ "exec" ],
 				"/bin/opkg*": [ "exec" ],
+				"/usr/bin/apk*": [ "exec" ],
+				"/opt/zapret/restore-def-cfg.sh*": [ "exec" ],
 				"/opt/zapret/sync_config.sh*": [ "exec" ]
 			},
 			"uci": [ "zapret", "network" ],
@@ -20,7 +23,8 @@
 		"write": {
 			"file": {
 				"/opt/zapret/config": [ "write" ],
-				"/opt/zapret/ipset/*.txt": [ "write" ],
+				"/opt/zapret/ipset/*": [ "write" ],
+				"/opt/zapret/init.d/openwrt/custom.d/*": [ "write" ],
 				"/etc/crontabs/root": [ "write" ]
 			},
 			"uci": [ "zapret" ]

zapret-ip2net/Makefile

@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=65
-PKG_RELEASE:=20241025
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
-PKG_SOURCE_DATE:=2024-10-25
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-01-16
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-mdig/Makefile

@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-mdig
-PKG_VERSION:=65
-PKG_RELEASE:=20241025
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
-PKG_SOURCE_DATE:=2024-10-25
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-01-16
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-tpws/Makefile

@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-tpws
-PKG_VERSION:=65
-PKG_RELEASE:=20241025
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
-PKG_SOURCE_DATE:=2024-10-25
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-01-16
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/Makefile

@@ -5,8 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=65
-PKG_RELEASE:=20241025
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -14,8 +13,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
-PKG_SOURCE_DATE:=2024-10-25
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-01-16
 
 #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?
@@ -77,21 +76,19 @@ define Package/$(PKG_NAME)/install
 	$(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) $(PKG_BUILD_DIR)/init.d/openwrt/zapret $(1)/etc/init.d/zapret
+	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
 	$(INSTALL_CONF) ./config.default $(1)/opt/zapret/config.default
-	#$(INSTALL_CONF) ./ipset/zapret-hosts-auto.txt         $(1)/opt/zapret/ipset/zapret-hosts-auto.txt
-	$(INSTALL_CONF) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset/zapret-hosts-user.txt
+	$(INSTALL_CONF) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset/zapret-hosts-google.txt
 	$(INSTALL_CONF) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-	$(INSTALL_CONF) ./ipset/zapret-hosts-user-ipban.txt   $(1)/opt/zapret/ipset/zapret-hosts-user-ipban.txt
-	#$(INSTALL_CONF) ./ipset/zapret-ip.txt                 $(1)/opt/zapret/ipset/zapret-ip.txt
 	$(INSTALL_CONF) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset/zapret-ip-exclude.txt
-	$(INSTALL_CONF) ./ipset/zapret-ip-user.txt            $(1)/opt/zapret/ipset/zapret-ip-user.txt
-	$(INSTALL_CONF) ./ipset/zapret-ip-user-exclude.txt    $(1)/opt/zapret/ipset/zapret-ip-user-exclude.txt
-	$(INSTALL_CONF) ./ipset/zapret-ip-user-ipban.txt      $(1)/opt/zapret/ipset/zapret-ip-user-ipban.txt
-	$(INSTALL_BIN) ./sync_config.sh $(1)/opt/zapret/sync_config.sh
 	$(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_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_BIN) ./comfunc.sh         $(1)/opt/zapret/comfunc.sh
+	$(INSTALL_BIN) ./def-cfg.sh         $(1)/opt/zapret/def-cfg.sh
+	$(INSTALL_BIN) ./renew-cfg.sh       $(1)/opt/zapret/renew-cfg.sh
+	$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret/restore-def-cfg.sh
+	$(INSTALL_BIN) ./sync_config.sh     $(1)/opt/zapret/sync_config.sh
 endef
 
 define Package/$(PKG_NAME)/preinst
@@ -109,7 +106,15 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		# stop service if PKG_UPGRADE
 		[ -x "/etc/init.d/zapret" ] && /etc/init.d/zapret stop >/dev/null 2>&1
 	fi
-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;}' )
+			if [ "$${CFGLISTHASH}" = "79e35df62b0d1ae455d0a7e04c4cecac" ]; then
+				rm -f "/opt/zapret/ipset/zapret-hosts-user.txt"
+			fi
+		fi
+	fi
+fi
 exit 0
 endef
 
@@ -119,6 +124,18 @@ define Package/$(PKG_NAME)/postinst
 if [ -z "$${IPKG_INSTROOT}" ]; then
 	ZAPRET_CONFIG=/opt/zapret/config
 	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	# creating main config if its not exists
+	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
+		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
+	fi
+	# check obsolete format for main config
+	if grep -qE "^NFQWS_OPT_DESYNC=|^MODE_HTTP=|^MODE_HTTPS=|^MODE_QUIC=|^MODE=" "$${ZAPRET_CONFIG}" ; then
+		echo "Detect obsolute format for main config!"
+		ZAPRET_CONFIG_BACKUP="$${ZAPRET_CONFIG}.backup"
+		cp -f "$${ZAPRET_CONFIG}" "$${ZAPRET_CONFIG_BACKUP}"
+		echo "Current file $${ZAPRET_CONFIG} backuped to $${ZAPRET_CONFIG_BACKUP}"
+		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
+	fi
 	# check existing uci-config
 	[ -f "/etc/config/zapret" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
 	# create or merge uci-config
@@ -126,11 +143,11 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret merged with default uci-config"
 	# remove uci-default script from system dir (used into /etc/init.d/boot)
 	rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh
-	# creating main config if its not exists
-	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
-		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
-		/opt/zapret/sync_config.sh
-	fi
+	# copy (sync) all params from uci-config to main config
+	/opt/zapret/sync_config.sh
+	# check main config
+	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
 	# stop all
@@ -152,7 +169,14 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	EXEDIR=/opt/zapret
 	ZAPRET_BASE=/opt/zapret
 	ZAPRET_CONFIG=/opt/zapret/config
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
 	OPENWRT_FW_INCLUDE=/etc/firewall.zapret
+	# check main config
+	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
+	if ! sh -n "$${ZAPRET_CONFIG}" 2>/dev/null ; then
+		ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+		exit 0
+	fi
 	. "$${ZAPRET_CONFIG}"
 	. "$${ZAPRET_BASE}/common/base.sh"
 	. "$${ZAPRET_BASE}/common/fwtype.sh"

zapret/comfunc.sh

@@ -0,0 +1,124 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+EXEDIR=/opt/zapret
+ZAPRET_BASE=/opt/zapret
+
+ZAPRET_INITD=/etc/init.d/zapret
+ZAPRET_ORIG_INITD="$ZAPRET_BASE/init.d/openwrt/zapret"
+
+ZAPRET_CONFIG="$ZAPRET_BASE/config"
+ZAPRET_CONFIG_NEW="$ZAPRET_BASE/config.new"
+ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
+
+ZAPRET_CFG=/etc/config/zapret
+ZAPRET_CFG_NAME=zapret
+ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_NAME.config )"
+
+. $ZAPRET_BASE/def-cfg.sh
+
+function adapt_for_sed
+{
+	local str=$( ( echo $1|sed -r 's/([\$\.\*\/\[\\^])/\\\1/g'|sed 's/[]]/\\]/g' )>&1 )
+	echo "$str"
+}
+
+function is_valid_config
+{
+	local fname=${1:-$ZAPRET_CONFIG}
+	sh -n "$fname" &>/dev/null
+	return $?
+}
+
+function get_ppid_by_pid
+{
+	local pid=$1
+	local ppid="$( cat /proc/$pid/status 2>/dev/null | grep '^PPid:' | awk '{print $2}' )"
+	echo "$ppid"
+}
+
+function get_proc_path_by_pid
+{
+	local pid=$1
+	local path=$( cat /proc/$pid/cmdline 2>/dev/null | tr '\0' '\n' | head -n1 )
+	echo "$path"
+}
+
+function get_proc_cmd_by_pid
+{
+	local pid=$1
+	local delim="$2"
+	local cmdline
+	if [ "$delim" = "" ]; then
+		cmdline="$( cat /proc/$pid/cmdline 2>/dev/null | tr '\0' '\n' )"
+	else
+		cmdline="$( cat /proc/$pid/cmdline 2>/dev/null | tr '\0' "$delim" )"
+	fi
+	echo "$cmdline"
+}
+
+function is_run_via_procd
+{
+	local pname
+	[ "$$" = "1" ] && return 0	
+	pname="$( get_proc_path_by_pid $$ )"
+	[ "$pname" = "/sbin/procd" ] && return 0
+	[ "$PPID" = "1" ] && return 0
+	pname="$( get_proc_path_by_pid $PPID )"
+	[ "$pname" = "/sbin/procd" ] && return 0
+	return 1
+}
+
+function is_run_on_boot
+{
+	local cmdline="$( get_proc_cmd_by_pid $$ ' ' )"
+	if echo "$cmdline" | grep -q " /etc/rc.d/S" ; then
+		if echo "$cmdline" | grep -q " boot $" ; then
+			return 0
+		fi
+	fi
+	return 1
+}
+
+function get_run_on_boot_option
+{
+	if [ "$( uci -q get $ZAPRET_CFG_NAME.config.run_on_boot )" = "1" ]; then
+		echo 1
+	else
+		echo 0
+	fi
+}
+
+function create_default_cfg
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local cfgfile=/etc/config/$cfgname
+	rm -f $cfgfile
+	touch $cfgfile
+	uci set $cfgname.config=main
+	set_cfg_default_values $cfgname
+	return 0
+}
+
+function merge_cfg_with_def_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local force=$2
+	local cfgfile=/etc/config/$cfgname
+	local NEWCFGNAME="zapret-default"
+	local NEWCFGFILE="/etc/config/$NEWCFGNAME"
+
+	local cfg_sec_name="$( uci -q get $ZAPRET_CFG_NAME.config )"
+	[ -z "$cfg_sec_name" ] && create_default_cfg
+
+	create_default_cfg "$NEWCFGNAME"
+	[ ! -f "$NEWCFGFILE" ] && return 1 
+
+	uci -m -f $cfgfile import "$NEWCFGNAME"
+	uci commit "$NEWCFGNAME"
+	uci -m -f "$NEWCFGFILE" import $cfgname
+	uci commit $cfgname
+	rm -f "$NEWCFGFILE"	
+	return 0
+}
+

zapret/config.default

@@ -7,6 +7,10 @@
 # override firewall type : iptables,nftables,ipfw
 FWTYPE=nftables
 
+# nftables only : set this to 0 to use pre-nat mode. default is post-nat.
+# pre-nat mode disables some bypass techniques for forwarded traffic but allows to see client IP addresses in debug log
+POSTNAT=1
+
 # options for ipsets
 # maximum number of elements in sets. also used for nft sets
 SET_MAXELEM=522288
@@ -41,66 +45,56 @@ GZIP_LISTS=0
 # set to "-" to disable reload
 #LISTS_RELOAD="pfctl -f /etc/pf.conf"
 
-# override ports
-HTTP_PORTS=80
-HTTPS_PORTS=443
-QUIC_PORTS=443
-
-# CHOOSE OPERATION MODE
-# MODE : nfqws,tpws,tpws-socks,filter,custom
-# nfqws : nfqws for dpi desync
-# tpws : tpws transparent mode
-# tpws-socks : tpws socks mode
-# filter : no daemon, just create ipset or download hostlist
-# custom : custom mode. should modify custom init script and add your own code
-MODE=nfqws
-
-MODE_HTTP=1
-MODE_HTTP_KEEPALIVE=0
-MODE_HTTPS=1
-MODE_QUIC=1
-
 # none,ipset,hostlist,autohostlist
 MODE_FILTER=hostlist
 
-# CHOOSE NFQWS DAEMON OPTIONS for DPI desync mode. run "nfq/nfqws --help" for option list
+# mark bit used by nfqws to prevent loop
 DESYNC_MARK=0x40000000
 DESYNC_MARK_POSTNAT=0x20000000
 
 
-NFQWS_OPT_DESYNC="--dpi-desync=fake,split2 --dpi-desync-ttl=7 --dpi-desync-ttl6=0 --dpi-desync-repeats=20 --dpi-desync-fooling=md5sig,badseq --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin"
+TPWS_SOCKS_ENABLE=0
+# tpws socks listens on this port on localhost and LAN interfaces
+TPPORT_SOCKS=987
+# use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
+# hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
+# <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
+TPWS_SOCKS_OPT="--filter-tcp=80 --methodeol <HOSTLIST> --new --filter-tcp=443 --split-tls=sni --disorder <HOSTLIST>"
 
-NFQWS_OPT_DESYNC_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTP=""
-
-NFQWS_OPT_DESYNC_HTTP_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTPS=""
-
-NFQWS_OPT_DESYNC_HTTPS_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTP6=""
-
-NFQWS_OPT_DESYNC_HTTP6_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTPS6=""
-
-NFQWS_OPT_DESYNC_HTTPS6_SUFFIX=""
-
-NFQWS_OPT_DESYNC_QUIC="--dpi-desync=fake,split2 --dpi-desync-repeats=15 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --dpi-desync=fake --dpi-desync-repeats=15"
-
-NFQWS_OPT_DESYNC_QUIC_SUFFIX=""
-
-NFQWS_OPT_DESYNC_QUIC6=""
-
-NFQWS_OPT_DESYNC_QUIC6_SUFFIX=""
+TPWS_ENABLE=0
+TPWS_PORTS="80,443"
+# use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
+# hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
+# <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
+TPWS_OPT="--filter-tcp=80 --methodeol <HOSTLIST> --new --filter-tcp=443 --split-tls=sni --disorder <HOSTLIST>"
 
 
-# CHOOSE TPWS DAEMON OPTIONS. run "tpws/tpws --help" for option list
-# SUFFIX VARS define additional lower priority desync profile. it's required if MODE_FILTER=hostlist and strategy has hostlist-incompatible 0-phase desync methods (mss)
-TPWS_OPT="--hostspell=HOST --split-http-req=method --split-pos=3 --oob"
-#TPWS_OPT_SUFFIX="--mss 88"
+NFQWS_ENABLE=1
+
+# redirect outgoing traffic with connbytes limiter applied in both directions.
+NFQWS_PORTS_TCP="80,443"
+NFQWS_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.
+NFQWS_TCP_PKT_OUT="9"
+NFQWS_TCP_PKT_IN="3"
+NFQWS_UDP_PKT_OUT="9"
+NFQWS_UDP_PKT_IN="0"
+
+# 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
+# typical example are plain HTTP keep alives
+# this mode can be very CPU consuming. enable with care !
+NFQWS_PORTS_TCP_KEEPALIVE=0
+NFQWS_PORTS_UDP_KEEPALIVE=0
+
+# use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
+# hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
+# <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
+NFQWS_OPT="--filter-tcp=80 <HOSTLIST> --dpi-desync=fake,fakedsplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new --filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake,multidisorder --dpi-desync-split-pos=1,midsld --dpi-desync-repeats=11 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin --new --filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --filter-udp=443 <HOSTLIST_NOAUTO> --dpi-desync=fake --dpi-desync-repeats=11 --new --filter-tcp=443 <HOSTLIST> --dpi-desync=fake,multidisorder --dpi-desync-split-pos=midsld --dpi-desync-repeats=6 --dpi-desync-fooling=badseq,md5sig"
+
 
 # FlowOffload mode : donttouch,none,software,hardware
 FLOWOFFLOAD=none

zapret/def-cfg.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+function set_cfg_default_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( echo -n -e '\t' )"
+	uci batch <<-EOF
+		set $cfgname.config.run_on_boot='0'
+		# settings for zapret service
+		set $cfgname.config.FWTYPE='nftables'
+		set $cfgname.config.POSTNAT='1'
+		set $cfgname.config.FLOWOFFLOAD='none'
+		set $cfgname.config.INIT_APPLY_FW='1'
+		set $cfgname.config.DISABLE_IPV4='0'
+		set $cfgname.config.DISABLE_IPV6='1'
+		set $cfgname.config.MODE_FILTER='hostlist'
+		# autohostlist options
+		set $cfgname.config.AUTOHOSTLIST_RETRANS_THRESHOLD='3'
+		set $cfgname.config.AUTOHOSTLIST_FAIL_THRESHOLD='3'
+		set $cfgname.config.AUTOHOSTLIST_FAIL_TIME='60'
+		set $cfgname.config.AUTOHOSTLIST_DEBUGLOG='0'
+		# nfqws options
+		set $cfgname.config.NFQWS_ENABLE='1'
+		set $cfgname.config.DESYNC_MARK='0x40000000'
+		set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
+		set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+		set $cfgname.config.NFQWS_PORTS_UDP='443'
+		set $cfgname.config.NFQWS_TCP_PKT_OUT='9'
+		set $cfgname.config.NFQWS_TCP_PKT_IN='3'
+		set $cfgname.config.NFQWS_UDP_PKT_OUT='9'
+		set $cfgname.config.NFQWS_UDP_PKT_IN='0'
+		set $cfgname.config.NFQWS_PORTS_TCP_KEEPALIVE='0'
+		set $cfgname.config.NFQWS_PORTS_UDP_KEEPALIVE='0'
+		set $cfgname.config.NFQWS_OPT="
+			--filter-tcp=80 <HOSTLIST>
+			--dpi-desync=fake,fakedsplit
+			--dpi-desync-autottl=2
+			--dpi-desync-fooling=md5sig
+			--new
+			--filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+			--dpi-desync=fake,multidisorder
+			--dpi-desync-split-pos=1,midsld
+			--dpi-desync-repeats=11
+			--dpi-desync-fooling=md5sig
+			--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+			--new
+			--filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+			--dpi-desync=fake
+			--dpi-desync-repeats=11
+			--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			--new
+			--filter-udp=443 <HOSTLIST_NOAUTO>
+			--dpi-desync=fake
+			--dpi-desync-repeats=11
+			--new
+			--filter-tcp=443 <HOSTLIST>
+			--dpi-desync=fake,multidisorder
+			--dpi-desync-split-pos=midsld
+			--dpi-desync-repeats=6
+			--dpi-desync-fooling=badseq,md5sig
+		"
+		# save changes
+		commit $cfgname
+	EOF
+	return 0
+}

zapret/init.d.sh

@@ -0,0 +1,73 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2024 remittor
+
+USE_PROCD=1
+# after network
+START=21
+
+SCRIPT_FILENAME=$1
+
+. /opt/zapret/comfunc.sh
+
+if ! is_valid_config ; then
+	logger -p err -t ZAPRET "Wrong main config: $ZAPRET_CONFIG"
+	exit 91
+fi
+
+. $ZAPRET_ORIG_INITD
+
+EXEDIR=/opt/zapret
+ZAPRET_BASE=/opt/zapret
+
+is_run_on_boot && IS_RUN_ON_BOOT=1 || IS_RUN_ON_BOOT=0
+
+
+function enable
+{
+	local run_on_boot=""
+	if [ "$IS_RUN_ON_BOOT" = "1" ]; then
+		if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+			run_on_boot=$( get_run_on_boot_option )
+			if [ $run_on_boot != 1 ]; then
+				logger -p notice -t ZAPRET "Attempt to enable service, but service blocked!"
+				return 61
+			fi
+		fi
+	fi
+	if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+		uci set $ZAPRET_CFG_NAME.config.run_on_boot=1
+		uci commit
+	fi
+	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD enable
+}
+
+function enabled
+{
+	local run_on_boot=""
+	if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+		run_on_boot=$( get_run_on_boot_option )
+		if [ $run_on_boot != 1 ]; then
+			if [ "$IS_RUN_ON_BOOT" = "1" ]; then
+				logger -p notice -t ZAPRET "Service is blocked!"
+			fi
+			return 61
+		fi
+	fi
+	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD enabled
+}
+
+function boot
+{
+	local run_on_boot=""
+	if [ "$IS_RUN_ON_BOOT" = "1" ]; then
+		if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+			run_on_boot=$( get_run_on_boot_option )
+			if [ $run_on_boot != 1 ]; then
+				logger -p notice -t ZAPRET "Attempt to run service on boot! Service is blocked!"
+				return 61
+			fi
+		fi
+	fi
+	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD start "$@"
+}
+

zapret/renew-cfg.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+. /opt/zapret/comfunc.sh
+
+merge_cfg_with_def_values
+
+CONFIGS_SYNC=0
+
+[ ! -f "$ZAPRET_CONFIG" ] && CONFIGS_SYNC=1
+[ "$1" = "sync" ] && CONFIGS_SYNC=1
+
+if [ "$CONFIGS_SYNC" = "1" ]; then
+	# renew main config
+	/opt/zapret/sync_config.sh
+fi

zapret/restore-def-cfg.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+. /opt/zapret/comfunc.sh
+
+cfg_run_on_boot="$( uci -q get zapret.config.run_on_boot )"
+
+create_default_cfg
+
+if [ "$cfg_run_on_boot" = "1" ]; then
+	uci set zapret.config.run_on_boot=1
+	uci commit
+fi
+
+if [ "$1" = "sync" ]; then
+	# renew main config
+	/opt/zapret/sync_config.sh
+fi

zapret/sync_config.sh

@@ -1,24 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-EXEDIR=/opt/zapret
-ZAPRET_BASE=/opt/zapret
-ZAPRET_CONFIG="$ZAPRET_BASE/config"
-ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
-ZAPRET_CFG=/etc/config/zapret
-
-ZAPRET_CFG_SEC_NAME="$( uci -q get zapret.config )"
-
-if [ -z "$ZAPRET_CFG_SEC_NAME" ]; then
-	# wrong uci-config
-	return 1
-fi
-
-function get_sed_compat
-{
-	local str=$( ( echo $1|sed -r 's/([\$\.\*\/\[\\^])/\\\1/g'|sed 's/[]]/\\]/g' )>&1 )
-	echo "$str"
-}
+. /opt/zapret/comfunc.sh
 
 function uncomment_param
 {
@@ -41,7 +24,7 @@ function append_param
 function set_param_value
 {
 	local param=$1
-	local value=$( get_sed_compat "$2" )
+	local value=$( adapt_for_sed "$2" )
 	local fname=${3:-$ZAPRET_CONFIG}
 	sed -i "s/^$param=.*/$param=$value/g" $fname
 }
@@ -49,7 +32,7 @@ function set_param_value
 function set_param_value_str
 {
 	local param=$1
-	local value=$( get_sed_compat "$2" )
+	local value=$( adapt_for_sed "$2" )
 	local fname=${3:-$ZAPRET_CONFIG}
 	sed -i "s/^$param=.*/$param=\"$value\"/g" $fname
 }
@@ -80,33 +63,43 @@ if [ ! -f "$ZAPRET_CONFIG" ]; then
 	fi
 fi
 
-sync_param MODE
+cp -f "$ZAPRET_CONFIG" "$ZAPRET_CONFIG_NEW"
+
+ZAPRET_CONFIG__SAVED="$ZAPRET_CONFIG"
+ZAPRET_CONFIG="$ZAPRET_CONFIG_NEW"
+
+sync_param FWTYPE
+sync_param POSTNAT
 sync_param FLOWOFFLOAD
 sync_param INIT_APPLY_FW
 sync_param DISABLE_IPV4
 sync_param DISABLE_IPV6
 sync_param MODE_FILTER
+
+sync_param AUTOHOSTLIST_RETRANS_THRESHOLD
+sync_param AUTOHOSTLIST_FAIL_THRESHOLD
+sync_param AUTOHOSTLIST_FAIL_TIME
+sync_param AUTOHOSTLIST_DEBUGLOG
+
+sync_param NFQWS_ENABLE
 sync_param DESYNC_MARK
 sync_param DESYNC_MARK_POSTNAT
-sync_param NFQWS_OPT_DESYNC str
-sync_param NFQWS_OPT_DESYNC_SUFFIX str
-sync_param MODE_HTTP
-sync_param MODE_HTTP_KEEPALIVE
-sync_param HTTP_PORTS
-sync_param NFQWS_OPT_DESYNC_HTTP str
-sync_param NFQWS_OPT_DESYNC_HTTP_SUFFIX str
-sync_param NFQWS_OPT_DESYNC_HTTP6 str
-sync_param NFQWS_OPT_DESYNC_HTTP6_SUFFIX str
-sync_param MODE_HTTPS
-sync_param HTTPS_PORTS
-sync_param NFQWS_OPT_DESYNC_HTTPS str
-sync_param NFQWS_OPT_DESYNC_HTTPS_SUFFIX str
-sync_param NFQWS_OPT_DESYNC_HTTPS6 str
-sync_param NFQWS_OPT_DESYNC_HTTPS6_SUFFIX str
-sync_param MODE_QUIC
-sync_param QUIC_PORTS
-sync_param NFQWS_OPT_DESYNC_QUIC str
-sync_param NFQWS_OPT_DESYNC_QUIC_SUFFIX str
-sync_param NFQWS_OPT_DESYNC_QUIC6 str
-sync_param NFQWS_OPT_DESYNC_QUIC6_SUFFIX str
+sync_param NFQWS_PORTS_TCP str
+sync_param NFQWS_PORTS_UDP str
+sync_param NFQWS_TCP_PKT_OUT str
+sync_param NFQWS_TCP_PKT_IN str
+sync_param NFQWS_UDP_PKT_OUT str
+sync_param NFQWS_UDP_PKT_IN str
+sync_param NFQWS_PORTS_TCP_KEEPALIVE
+sync_param NFQWS_PORTS_UDP_KEEPALIVE
+sync_param NFQWS_OPT str
 
+ZAPRET_CONFIG="$ZAPRET_CONFIG__SAVED"
+
+if is_valid_config "$ZAPRET_CONFIG_NEW" ; then
+	cp -f "$ZAPRET_CONFIG_NEW" "$ZAPRET_CONFIG"
+	rm -f "$ZAPRET_CONFIG_NEW"
+else
+	rm -f "$ZAPRET_CONFIG_NEW"
+	return 97
+fi

zapret/uci-def-cfg.sh

@@ -1,120 +1,18 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-SCRIPT_SOURCED=0
-case ${0##*/} in ash|-ash) SCRIPT_SOURCED=1;; esac
-#[[ $_ != $0 ]] && echo "Script is being sourced" || echo "Script is a subshell"
+. /opt/zapret/comfunc.sh
 
-ZAPRET_BASE=/opt/zapret
-ZAPRET_CONFIG="$ZAPRET_BASE/config"
-ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
-ZAPRET_CFG_FILE=/etc/config/zapret
-ZAPRET_CFG_NAME=zapret
+# create empty txt files into ipset directory
+[ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt"     ] && touch "/opt/zapret/ipset/zapret-hosts-google.txt"
+#[ ! -f "/opt/zapret/ipset/zapret-hosts-auto.txt"      ] && touch "/opt/zapret/ipset/zapret-hosts-auto.txt"
+[ ! -f "/opt/zapret/ipset/zapret-hosts-user.txt"       ] && touch "/opt/zapret/ipset/zapret-hosts-user.txt"
+[ ! -f "/opt/zapret/ipset/zapret-hosts-user-ipban.txt" ] && touch "/opt/zapret/ipset/zapret-hosts-user-ipban.txt"
+#[ ! -f "/opt/zapret/ipset/zapret-ip.txt"              ] && touch "/opt/zapret/ipset/zapret-ip.txt"
+[ ! -f "/opt/zapret/ipset/zapret-ip-user.txt"          ] && touch "/opt/zapret/ipset/zapret-ip-user.txt"
+[ ! -f "/opt/zapret/ipset/zapret-ip-user-exclude.txt"  ] && touch "/opt/zapret/ipset/zapret-ip-user-exclude.txt"
+[ ! -f "/opt/zapret/ipset/zapret-ip-user-ipban.txt"    ] && touch "/opt/zapret/ipset/zapret-ip-user-ipban.txt"
 
-CFG_OPT_FORCE=0
-CFG_OPT_MERGE=0
-CFG_OPT_SYNC_CFG=0
-
-
-function set_default_values
-{
-	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\t' )"
-	uci batch <<-EOF
-		set $cfgname.config.autostart='0'
-		set $cfgname.config.FWTYPE='nftables'
-		set $cfgname.config.MODE='nfqws'
-		set $cfgname.config.FLOWOFFLOAD='none'
-		set $cfgname.config.INIT_APPLY_FW='1'
-		set $cfgname.config.DISABLE_IPV4='0'
-		set $cfgname.config.DISABLE_IPV6='1'
-		set $cfgname.config.MODE_FILTER='hostlist'
-		set $cfgname.config.DESYNC_MARK='0x40000000'
-		set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
-		set $cfgname.config.NFQWS_OPT_DESYNC='--dpi-desync=fake,split2 --dpi-desync-ttl=7 --dpi-desync-ttl6=0 --dpi-desync-repeats=20 --dpi-desync-fooling=md5sig,badseq --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin'
-		set $cfgname.config.NFQWS_OPT_DESYNC_SUFFIX="$TAB"
-		set $cfgname.config.MODE_HTTP='1'
-		set $cfgname.config.MODE_HTTP_KEEPALIVE='0'
-		set $cfgname.config.HTTP_PORTS='80'
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP_SUFFIX="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6_SUFFIX="$TAB"
-		set $cfgname.config.MODE_HTTPS='1'
-		set $cfgname.config.HTTPS_PORTS='443'
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS_SUFFIX="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6_SUFFIX="$TAB"
-		set $cfgname.config.MODE_QUIC='1'
-		set $cfgname.config.QUIC_PORTS='443'
-		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC='--dpi-desync=fake,split2 --dpi-desync-repeats=15 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --dpi-desync=fake --dpi-desync-repeats=15'
-		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC_SUFFIX="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6="$TAB"
-		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6_SUFFIX="$TAB"
-		commit $cfgname
-	EOF
-	return 0
-}
-
-function create_default_config
-{
-	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local cfgfile=/etc/config/$cfgname
-	rm -f $cfgfile
-	touch $cfgfile
-	uci set $cfgname.config=main
-	set_default_values $cfgname
-	return 0
-}
-
-function merge_config_with_def_values
-{
-	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local force=$2
-	local cfgfile=/etc/config/$cfgname
-	local NEWCFGNAME="zapret-default"
-	local NEWCFGFILE="/etc/config/$NEWCFGNAME"
-
-	create_default_config "$NEWCFGNAME"
-	[ ! -f "$NEWCFGFILE" ] && return 1 
-
-	uci -m -f $cfgfile import "$NEWCFGNAME"
-	uci commit "$NEWCFGNAME"
-	uci -m -f "$NEWCFGFILE" import $cfgname
-	uci commit $cfgname
-	rm -f "$NEWCFGFILE"	
-	return 0
-}
-
-
-if [ "$SCRIPT_SOURCED" != "1" ]; then
-	while getopts "fms" SCRIPT_OPT; do
-		case $SCRIPT_OPT in
-			f) CFG_OPT_FORCE=1;;
-			m) CFG_OPT_MERGE=1;;
-			s) CFG_OPT_SYNC_CFG=1;;
-		esac
-	done
-
-	if [ ! -f "$ZAPRET_CFG_FILE" ]; then
-		CFG_OPT_FORCE=1
-	fi
-
-	if [ "$CFG_OPT_FORCE" = "1" ]; then
-		create_default_config
-		[ "$CFG_OPT_SYNC_CFG" = "1" ] && /opt/zapret/sync_config.sh
-		return 0
-	fi
-fi
-
-
-CFG_OPT_MERGE=1
-merge_config_with_def_values
-
-if [ ! -f "$ZAPRET_CONFIG" ]; then
-	# create main config
-	/opt/zapret/sync_config.sh
-fi
-
-return 0
+# create or merge uci-config
+$ZAPRET_BASE/renew-cfg.sh
+