Bump version to v72.20260131

.github/workflows/build.yml

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

luci-app-zapret/Makefile

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

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

@@ -158,13 +158,17 @@ return baseclass.extend({
                 E('br'), E('br'),
                 this.logArea,
             ]),
-            E('div', { 'class': 'right' }, [
+            E('div', { 'style': 'display:flex; justify-content:space-between; align-items:center; margin-top:1px;' }, [
+                E('div', { 'class': 'left' }, [
                     this.btn_sitescheck,
                     ' ',
                     this.btn_dpicheck,
+                ]),
+                E('div', { 'class': 'right' }, [
                     ' ',
                     this.btn_cancel,
-            ])
+                ]),
+            ]),
         ]);
     }    
 });

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

@@ -175,6 +175,10 @@ return view.extend({
 
     statusPoll: function()
     {
+        if (tools.isModalActive()) {
+            this.POLL.running = false;
+            return;  // not update page when any modal dialog is active
+        }
         this.getAppStatus().then(
             L.bind(this.setAppStatus, this)
         );
@@ -228,6 +232,7 @@ return view.extend({
         let cancel_button = E('button', {
             'class': btn_style_neutral,
             'click': ui.hideModal,
+            'class': btn_style_warning,
         }, _('Cancel'));
 
         let resetcfg_btn = E('button', {
@@ -277,11 +282,14 @@ return view.extend({
                 nfqws_strat,
                 E('br'), E('br')
             ]),
+            E('div', { 'style': 'display:flex; justify-content:space-between; align-items:center; margin-top:1px;' }, [
+                E('div', { 'class': 'left' }, [
+                    resetcfg_btn,
+                ]),
                 E('div', { 'class': 'right' }, [
                     cancel_button,
-                ' ',
+                ]),
-                resetcfg_btn,
+            ]),
-            ])
         ]);
     },
 

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

@@ -761,7 +761,12 @@ return baseclass.extend({
         },
     }),
 
-    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    isModalActive: function()
+    {
+        return document.body.classList.contains('modal-overlay-active');
+    },
+
+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ] } = {})
     {
         function appendLog(msg, end = '\n')
         {
@@ -775,36 +780,49 @@ return baseclass.extend({
             }
         }
         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);
+            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null);
             appendLog('Output file cleared!');
         } catch (e) {
             return callback.call(ctx, 500, 'ERROR: Failed to clear output file');
         }
-        try {
+        let processStarted = false;
         let opt_list = [ logFile ];
+        try {
             opt_list.push(...cmd);
-            let res = await fs.exec(this.appDir+'/script-exec.sh', opt_list, null, rpc_opt);
+            //console.log('script-exec.sh ... '+JSON.stringify(opt_list));
-            if (res.code != 0) {
+            let proc = new Promise((resolve) => {
-                return callback.call(ctx, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
+                fs.exec(this.appDir+'/script-exec.sh', opt_list, null)
-            }
+                    .then (() => { resolve(); })
-            appendLog('Process started...');
+                    .catch(() => { resolve(); });
+            });
         } catch (e) {
             return callback.call(ctx, 520, 'ERROR: Failed on execute process: ' + e.message);
         }
         let lastLen = 0;
         let retCode = -1;
         return await new Promise(async (resolve, reject) => {
+            let ticks = 0;
             async function epoll()
             {
+                ticks += 1;
                 try {
-                    let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
+                    let res = await fs.exec('/bin/cat', [ logFile ], null);
+                    if (res.code != 0) {
+                        if (ticks > 1) {
+                            console.log('ERROR: execAndRead: '+JSON.stringify(opt_list));
+                            resolve(callback.call(ctx, 541, 'ERROR: Failed on read process log: code = ' + res.code));
+                            return;
+                        }
+                        setTimeout(epoll, 500);
+                        return;  // skip first step with error
+                    }
+                    if (!processStarted) {
+                        appendLog('Process started...');
+                        processStarted = true;
+                    }
                     if (res.stdout && res.stdout.length > lastLen) {
                         let log = res.stdout.slice(lastLen);
                         hide_rows.forEach(re => {
@@ -814,7 +832,7 @@ return baseclass.extend({
                         lastLen = res.stdout.length;
                     }
                     if (retCode < 0) {
-                        let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
+                        let rc = await fs.exec('/bin/cat', [ rcFile ], null);
                         if (rc.code != 0) {
                             fixLogEnd();
                             resolve(callback.call(ctx, 545, 'ERROR: cannot read file "' + rcFile + '"'));

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

@@ -201,13 +201,17 @@ return baseclass.extend({
                 E('hr'),
                 this.logArea,
             ]),
-            E('div', { 'class': 'right' }, [
+            E('div', { 'style': 'display:flex; justify-content:space-between; align-items:center; margin-top:1px;' }, [
+                E('div', { 'class': 'left' }, [
                     this.btn_check,
                     ' ',
                     this.btn_install,
+                ]),
+                E('div', { 'class': 'right' }, [
                     ' ',
                     this.btn_cancel,
-            ])
+                ]),
+            ]),
         ]);
-    }    
+    },
 });

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20260128
+PKG_VERSION:=72.20260131
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=119e243b3664d6a512ed8b6ab61dcba00987105c
-PKG_SOURCE_DATE:=2026-01-28
+PKG_SOURCE_DATE:=2026-01-31
 
 #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?
@@ -37,7 +37,7 @@ define Package/$(PKG_NAME)
 	DEPENDS:= +nftables +curl +gzip
 	DEPENDS+= +coreutils +coreutils-sort +coreutils-sleep
 	DEPENDS+= +kmod-nft-nat +kmod-nft-offload +kmod-nft-queue
-	DEPENDS+= +libnetfilter-queue +libcap +zlib
+	DEPENDS+= +libnetfilter-queue +libmnl +libcap +zlib
 endef
 
 define Build/Prepare
@@ -180,7 +180,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
-	if $${PKG_CHECK} zapret >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret 2>/dev/null | grep -q . ; then
 		if [ ! -f "/opt/zapret/sync_config.sh" ]; then
 			echo "Please uninstall incompatible \"zapret\" package!"
 			exit 47
@@ -190,7 +190,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			exit 48
 		fi
 	fi
-	if $${PKG_CHECK} luci-app-zapret >/dev/null 2>&1; then
+	if $${PKG_CHECK} luci-app-zapret 2>/dev/null | grep -q . ; then
 		SVC_FILE=/www/luci-static/resources/view/zapret/service.js
 		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
 			echo "Please uninstall incompatible \"luci-app-zapret\" package!"
@@ -206,10 +206,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
 		echo "All files of the previously installed package have been removed!"
 	fi
-	if $${PKG_CHECK} zapret-mdig >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret-mdig 2>/dev/null | grep -q . ; then
 		$${PKG_REMOVE} zapret-mdig
 	fi
-	if $${PKG_CHECK} zapret-ip2net >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret-ip2net 2>/dev/null | grep -q . ; then
 		$${PKG_REMOVE} zapret-ip2net
 	fi
 	if [ ! -d "$${ZAPRET_DIR}" ]; then

zapret/dwc.sh

@@ -76,7 +76,7 @@ TEST_SUITE='
   { 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: "DE.HE-02", provider: "🇩🇪 Hetzner", times: 1, url: "https://accesorioscelular.com/tienda/css/plugins.css" },
   { 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://nioges.com/libs/fontawesome/webfonts/fa-solid-900.woff2" },
   { id: "FI.HE-03", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bdae.nip.io/1MB.bin" },
@@ -88,11 +88,11 @@ TEST_SUITE='
   { 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/footer/footer-element-es2015.js" },
-  { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
+  { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://ssl.p.jwpcdn.com/player/v/8.40.5/bidding.js" },
   { 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: "FR.CNTB-01", provider: "🇫🇷 Contabo", times: 1, url: "https://xdmarineshop.gr/index.php?route=index" },
   { 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" }
 '

zapret/script-exec.sh

@@ -1,15 +1,22 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
+PID_FILE=/tmp/zapret-script-exec.pid
+[ -f $PID_FILE ] && exit 70
 LOG_FILE=$1
 RC_FILE=$1.rc
-shift 1
+SH_FILE=$2
+shift 2
+[ ! -f $SH_FILE ] && exit 71
 : > $LOG_FILE
 : > $RC_FILE
-(
+start-stop-daemon -S -b -p $PID_FILE -x /bin/sh -- -c '
-	exec </dev/null >/dev/null 2>&1
+	LOG_FILE=$1
-	"$@" >> $LOG_FILE 2>&1
+	RC_FILE=$2
-	RETCODE=$?
+	SH_FILE=$3
+	shift 3
+	sh $SH_FILE "$@" > $LOG_FILE 2>&1
+	RET_CODE=$?
 	sleep 1
-	echo $RETCODE > $RC_FILE
+	echo $RET_CODE > $RC_FILE
-) &
+' sh $LOG_FILE $RC_FILE $SH_FILE "$@"
 exit 0

zapret/update-pkg.sh

@@ -89,6 +89,16 @@ fi
 
 # -------------------------------------------------------------------------------------------------------
 
+function check_pkg_installed
+{
+	local pkg_name="$1"
+	if [ "$PKG_MGR" = apk ]; then
+		apk info -e "$pkg_name" >/dev/null 2>&1; 
+	else
+		opkg status "$pkg_name" 2>/dev/null | grep -q .
+	fi
+}
+
 function get_distrib_param
 {
 	local parname=$1
@@ -475,7 +485,7 @@ if [ "$opt_update" != "" ]; then
 	mkdir $ZAP_PKG_DIR
 	ZAP_PKG_FN="$ZAP_PKG_DIR/${ZAP_PKG_URL##*/}"
 	echo "Download ZIP-file..."
-	curl -s -L --max-time 15 -H "$CURL_HEADER2" "$ZAP_PKG_URL" -o "$ZAP_PKG_FN"
+	curl -s -L --retry 5 --retry-delay 1 --retry-max-time 55 --retry-all-errors --max-time 30 -H "$CURL_HEADER2" "$ZAP_PKG_URL" -o "$ZAP_PKG_FN"
 	if [ $? -ne 0 ]; then
 		echo "ERROR: cannot download package!"
 		return 215
@@ -529,11 +539,11 @@ if [ "$opt_update" != "" ]; then
 	if [ "$opt_forced" = true ]; then
 		pkg_mgr_update
 	fi
-	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-mdig >/dev/null 2>&1; then
+	if check_pkg_installed ${ZAPRET_CFG_NAME}-mdig; then
 		echo "Uninstall mdig..."
 		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-mdig
 	fi
-	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-ip2net >/dev/null 2>&1; then
+	if check_pkg_installed ${ZAPRET_CFG_NAME}-ip2net; then
 		echo "Uninstall ip2net..."
 		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-ip2net
 	fi