Bump version to v72.20260114

PR: ad6b23f4aa

luci-app-zapret/Makefile

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

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

@@ -7,6 +7,11 @@
 'require view';
 'require view.zapret.tools as tools';
 
+document.head.appendChild(E('link', {
+    rel: 'stylesheet',
+    href: L.resource('view/zapret/styles.css')
+}));
+
 return view.extend({
     parsers: { },
 
@@ -128,8 +133,10 @@ return view.extend({
             let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname);
             btn.inputtitle = _('Edit');
             btn.inputstyle = 'edit btn';
-            let val = sec.taboption(tabname, form.DummyValue, '_' + param);
+            let val = sec.taboption(tabname, form.TextValue, '_' + param);
-            val.rawhtml = multiline ? true : false;
+            val.readonly = true;
+            val.rows = rows + 5;
+            val.wrap = false;
             val.cfgvalue = function(section_id) {
                 let value = uci.get(tools.appName, section_id, param);
                 if (value == null) {
@@ -141,15 +148,10 @@ return view.extend({
                     value = value.replace(/\n --/g, "\n--");
                     value = value.replace(/ --/g, "\n--");
                 }
-                if (val.rawhtml) {
-                    value = value.replace(/</g, '˂');
-                    value = value.replace(/>/g, '˃');
-                    value = value.replace(/\n/g, '<br/>');
-                }
                 return value;
             };
             val.validate = function(section_id, value) {
-                return (value) ? value.trim() : "";
+                return true;
             };
             let desc = locname;
             if (multiline == 2) {
@@ -279,6 +281,10 @@ return view.extend({
             o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_MAXSEQ', _('RETRANS_MAXSEQ'));
             o.rmempty     = false;
             o.datatype    = 'uinteger';
+
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_RESET', _('RETRANS_RESET'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
         }
         
         o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_THRESHOLD', _('RETRANS_THRESHOLD'));

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

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

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

@@ -506,24 +506,10 @@ return baseclass.extend({
             value = value.replace(/˂/g, '<');
             value = value.replace(/˃/g, '>');
             try {
-                let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam);
+                let elem = document.getElementById("widget.cbid." + this.appName + ".config._" + this.cfgparam);
-                if (elem) {
-                    if (elem.querySelector('div')) {
-                        elem = elem.querySelector('div');
-                    } else {
-                        elem = elem.querySelector('output');
-                    }
-                }
                 if (elem) {
                     let val = value.trim();
-                    if (this.multiline) {
+                    elem.textContent = val;
-                        val = val.replace(/</g, '˂');
-                        val = val.replace(/>/g, '˃');
-                        val = val.replace(/\n/g, '<br/>');
-                        elem.innerHTML = val;
-                    } else {
-                        elem.textContent = val;
-                    }
                 }
             } catch(e) {
                 console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20260113
+PKG_VERSION:=72.20260114
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=75d2f1195d4beb69eaa614afb117a43e82998518
+PKG_SOURCE_VERSION:=76764ad6b0ee7d3991c97e7b8c24d53189d25c28
-PKG_SOURCE_DATE:=2026-01-13
+PKG_SOURCE_DATE:=2026-01-14
 
 #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/comfunc.sh

@@ -179,7 +179,7 @@ function insert_cron_task_logs
 {
 	[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
 	[ ! -f "$CRONTAB_FILE" ] && return 1
-	if ! grep -q -e "-name '$ZAPRET_CFG_NAME\*\.log' -size \+" "$CRONTAB_FILE"; then
+	if ! grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size \+" "$CRONTAB_FILE"; then
 		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
 		/etc/init.d/cron restart 2> /dev/null
 	fi

zapret/dwc.sh

@@ -9,6 +9,9 @@ rm -rf $ZAP_TMP_DIR
 
 CURL_TIMEOUT=5
 CURL_RANGETO=65535
+CURL_NOCACHE='cache-control: no-cache'
+CURL_NOCACHE2='pragma: no-cache'
+CURL_USERAGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36'
 
 if ! command -v curl >/dev/null 2>&1; then
 	echo "ERROR: package \"curl\" not installed!"
@@ -45,7 +48,7 @@ TEST_SUITE='[
   { id: "DE.AWS-01", provider: "🇩🇪 AWS", times: 1, url: "https://www.getscope.com/assets/fonts/fa-solid-900.woff2" },
   { id: "US.AWS-01", provider: "🇺🇸 AWS", times: 1, url: "https://corp.kaltura.com/wp-content/cache/min/1/wp-content/themes/airfleet/dist/styles/theme.css" },
   { id: "US.GC-01", provider: "🇺🇸 Google Cloud", times: 1, url: "https://api.usercentrics.eu/gvl/v3/en.json" },
-  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/main.c7b61d59416f714f.js" },
+  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/footer/footer-element-es2015.js" },
   { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
   { id: "US.AKM-01", provider: "🇺🇸 Akamai", times: 1, url: "https://www.roxio.com/static/roxio/images/products/creator/nxt9/call-action-footer-bg.jpg" },
   { id: "PL.AKM-01", provider: "🇵🇱 Akamai", times: 1, url: "https://media-assets.stryker.com/is/image/stryker/gateway_1?$max_width_1410$" },
@@ -60,60 +63,107 @@ function trim
 	echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
 }
 
-mkdir -p $ZAP_TMP_DIR
+mkdir -p "$ZAP_TMP_DIR"
 
-ID=0
+TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
-while IFS='|' read -r TAG PROVIDER TIMES URL; do
+: > "$TARGET_LIST_FILE"
+IDX=0
+while IFS= read -r line; do
+	case "$line" in
+		*id:*provider:*url:*)
+			IDX=$((IDX + 1))
+			TAG=$( printf '%s\n' "$line" | cut -d'"' -f2 )
+			COUNTRY="${TAG%%.*}"
+			PROVIDER_RAW=$( printf '%s\n' "$line" | cut -d'"' -f4 )
+			PROVIDER="${PROVIDER_RAW#* }"
+			TIMES=$( printf '%s\n' "$line" | cut -d':' -f4 | cut -d',' -f1 | tr -d ' ')
+			URL=$( printf '%s\n' "$line" | cut -d'"' -f6 )
+			echo "${IDX}|${TAG}|${COUNTRY}|${PROVIDER}|${TIMES}|${URL}" >> "$TARGET_LIST_FILE"
+		;;
+	esac
+done <<EOF
+$TEST_SUITE
+EOF
+
+CURL_CON_TIMEOUT=$((CURL_TIMEOUT-2))
+CURL_SPEED_TIME=$((CURL_TIMEOUT-2))
+CURL_SPEED_LIMIT=1
+
+while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 	[ -z "$TAG" ] && continue
 	ID=$((ID+1))
-	ID3=$(printf '%03d' "$ID")
+	ID3=$( printf '%03d' "$ID" )
-	COUNTRY="$(echo "$TAG" | cut -d. -f1)"
+	COUNTRY=$( echo "$TAG" | cut -d. -f1 )
-	CNTFLAG="$(echo "$PROVIDER" | awk '{print $1}')"
+	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"
+	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
+	FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
 	(
-		DST_IP=$( curl -4 -s -o /dev/null -w '%{remote_ip}\n' $DOMAIN )
+		DST_IP="???"
-		if [ -z "$DST_IP" ]; then
+		if [ "$DST_IP" = "" ]; then
-			DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
+			CURL_TIMEOUTS="--connect-timeout 5 --max-time 6 --speed-time 5 --speed-limit 1"
+			#DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
+			if [ -z "$DST_IP" ]; then
+				DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
+			fi
+			if [ -z "$DST_IP" ]; then
+				DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
+			fi
 		fi
-		curl -k $URL --resolve $DOMAIN:443:$DST_IP -o /dev/null -s -w '%{size_download}\n' --max-time $CURL_TIMEOUT --range 0-$CURL_RANGETO
+		echo "$URL" > "$FNAME.url"
-	) >"$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER.txt" 2>&1 &
+		echo "$DST_IP" > "$FNAME.ip"
-done <<EOF
+		RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
-$(printf '%s\n' "$TEST_SUITE" | sed -n '
+		curl "$URL" \
-s/.*id:[[:space:]]*"\([^"]*\)".*provider:[[:space:]]*"\([^"]*\)".*times:[[:space:]]*\([0-9]\+\).*url:[[:space:]]*"\([^"]*\)".*/\1|\2|\3|\4/p
+			--connect-timeout $CURL_CON_TIMEOUT \
-')
+			--max-time $CURL_TIMEOUT \
-EOF
+			--speed-time $CURL_SPEED_TIME \
+			--speed-limit $CURL_SPEED_LIMIT	\
+			--range 0-$CURL_RANGETO \
+			-A "$CURL_USERAGENT" \
+			-D "$FNAME.hdr" \
+			-o "$FNAME.body"
+	) > "$FNAME.txt" 2>&1 &
+done < "$TARGET_LIST_FILE"
 
 wait
 
 printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
 	[ -f "$file" ] || continue
 	FNAME="${file##*/}"
+	FNAME="${FNAME%.txt}" 
 	ID=$( echo "$FNAME" | cut -d= -f1)
 	TAG=$( echo "$FNAME" | cut -d= -f2)
-	PROVIDER=$(echo "$FNAME" | cut -d= -f3 | sed 's/\.txt$//' )
+	PROVIDER=$(echo "$FNAME" | cut -d= -f3 )
-	res=$( cat "$file" )
+	FNAME="$ZAP_TMP_DIR/$FNAME"
-	res=$( trim "$res" )
+	BODY_SIZE=0
+	[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
 	status=
-	case "$res" in
+	if [ ! -f "$FNAME.ip" ]; then
-		''|*[!0-9]*)
+		status="ERROR: cannot get IP-Addr"
-			status="Error (incorrect value)"
+	elif [ ! -s "$FNAME.ip" ]; then
-			;;
+		status="ERROR: cannot get ip-addr"
-	esac
+	elif [ ! -f "$FNAME.hdr" ]; then
-	if [ -z "$status" ]; then
+		status="ERROR: cannot Get Headers"
-		if [ "$res" = 0 ]; then
+	elif [ ! -s "$FNAME.hdr" ]; then
-			status="Possibly detected"
+		status="ERROR: cannot get headers"
-		elif [ "$res" -lt $CURL_RANGETO ]; then
+	elif [ ! -f "$FNAME.body" ]; then
-			status="Failed to complete detection"
+		status="ERROR: cannot get body"
+	elif [ ! -s "$FNAME.body" ]; then
+		status="Possibly detected"
+	else
+		if [ "$BODY_SIZE" -le $CURL_RANGETO ]; then
+			status="Failed to complete detection (recv $BODY_SIZE bytes)"
 		else
 			status="[ OK ]"
 		fi
 	fi
 	printf '%12s / %-13s: %s \n' "$TAG" "$PROVIDER" "$status"
+	echo "$BODY_SIZE" > "$FNAME.size"
 done
 
+rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
+
 return 0