Improved scripts box

Author: twnesss

box/scripts/box.iptables

@@ -9,12 +9,13 @@ pref="100"
 # disable / enable quic using iptables rules 
 quic="enable"
 tun_forward="enabled"
+fake_ip_range=""
 
 iptables_version=$(iptables --version | busybox awk '/^iptables/ {print $2}')
 required_version="v1.6.1"
 if [ "$(printf '%s\n' "$required_version" "$iptables_version" | sort -V | head -n1)" = "$required_version" ]; then
-  IPV="iptables -w 100"
-  IP6V="ip6tables -w 100"
+  IPV="iptables -w 32"
+  IP6V="ip6tables -w 32"
 else
   IPV="iptables"
   IP6V="ip6tables"
@@ -25,7 +26,7 @@ case "${bin_name}" in
   "clash")
     clash_mode=$(busybox awk '!/^ *#/ && /mode: / { print $2;found=1; exit } END{ if(!found) print "rules" }' "${clash_config}" 2>/dev/null)
     clash_enhanced_mode=$(busybox awk '!/^ *#/ && /enhanced-mode: / { print $2;found=1; exit } END{ if(!found) print "fake-ip" }' "${clash_config}" 2>/dev/null)
-    fake_ip_range=$(busybox awk '!/^ *#/ && /fake-ip-range:/ { print $2; found=1; exit } END { if (!found) print "198.18.0.1/16" }' "${clash_config}" 2>/dev/null)
+    [ ${clash_enhanced_mode} != "fake-ip" ] && fake_ip_range=$(busybox awk '!/^ *#/ && /fake-ip-range:/ { print $2; found=1; exit } END { if (!found) print "198.18.0.1/16" }' "${clash_config}" 2>/dev/null)
     clash_dns_port=$(busybox awk '!/^ *#/ && /listen:/ { split($0, arr, ":"); print arr[3]; found=1; exit } END{ if(!found) print "1053" }' "${clash_config}" 2>/dev/null)
     if [[ "${network_mode}" == @(mixed|tun) ]]; then
       tun_device=$(busybox awk '!/^ *#/ && /device: / { print $2;found=1; exit } END{ if(!found) print "utun" }' "${clash_config}" 2>/dev/null)
@@ -43,8 +44,8 @@ case "${bin_name}" in
     ;;
   "xray" | "v2fly" | "hysteria" )
     if [[ "${network_mode}" != "tproxy" ]]; then
-      log Error "$bin_name does not support network_mode: $network_mode"
-      exit 1
+      log Warning "$bin_name does not support network_mode: $network_mode, return to TProxy"
+      sed -i 's/\(network_mode=\)\"[^\"]*\"/\1"tproxy"/g' ${settings}
     fi
     ;;
   *)

box/scripts/box.service

@@ -215,12 +215,12 @@ prepare_singbox() {
     fi
 
     # add exclude_package/include_package for tun
-    # "${yq}" '(.inbounds[] | select(.type == "tun") | .include_package) = []' -i --output-format=json "${sing_config}"
-    # "${yq}" '(.inbounds[] | select(.type == "tun") | .exclude_package) = []' -i --output-format=json "${sing_config}"
-    # [ ${proxy_mode} = "blacklist" ] && local mode="exclude" || mode="include"
-    # for package in "${packages_list[@]}"; do
-      # "${yq}" eval '(.inbounds[] | select(.type == "tun") | .'${mode}'_package) += ["'${package}'"]' -i --output-format=json "${sing_config}"
-    # done
+    "${yq}" '(.inbounds[] | select(.type == "tun") | .include_package) = []' -i --output-format=json "${sing_config}"
+    "${yq}" '(.inbounds[] | select(.type == "tun") | .exclude_package) = []' -i --output-format=json "${sing_config}"
+    [ ${proxy_mode} = "blacklist" ] && local mode="exclude" || mode="include"
+    for package in "${packages_list[@]}"; do
+      "${yq}" eval '(.inbounds[] | select(.type == "tun") | .'${mode}'_package) += ["'${package}'"]' -i --output-format=json "${sing_config}"
+    done
 
     # Add "redirect" configuration based on network_mode
     if [[ "${network_mode}" == @(mixed|enhance|redirect) ]]; then
@@ -296,12 +296,13 @@ prepare_clash() {
         '  enable: true' \
         '  mtu: 9000' \
         '  device: utun' \
-        '  stack: system # mixed / gvisor / system / lwip' \
+        '  stack: mixed # system / gvisor / system / lwip' \
         '  dns-hijack:' \
         '    - any:53' \
         '    - tcp://any:53' \
         '  auto-route: true' \
-        '  strict-route: false' \
+        '  strict-route: true' \
+        '  auto-redirect: true' \
         '  auto-detect-interface: true' \
         '  include-android-user: [0, 10]' \
         '  exclude-package: []' \
@@ -312,17 +313,19 @@ prepare_clash() {
     fi
 
     # add exclude-package/include-package for tun
-    # package=$(IFS=","; echo "${packages_list[*]}" | tr ' ' ',')
-    # list_package="${package:-\"\"}"
-    # if [ "${proxy_mode}" = "whitelist" ]; then
-      # mode="include-package"
-    # elif [ "${proxy_mode}" = "blacklist" ]; then
-      # mode="exclude-package"
-    # fi
-    # sed -i "s/exclude-package:.*/exclude-package: []/g" "${clash_config}"
-    # sed -i "s/include-package:.*/include-package: []/g" "${clash_config}"
-    # sed -i "s/${mode}:.*/${mode}: [\"${list_package//,/\",\"}\"]/g" "${clash_config}"
-
+    package=$(IFS=","; echo "${packages_list[*]}" | tr ' ' ',')
+    list_package="${package:-}"
+    if [ "${proxy_mode}" = "whitelist" ]; then
+      mode="include-package"
+    elif [ "${proxy_mode}" = "blacklist" ]; then
+      mode="exclude-package"
+    fi
+    sed -i "s/exclude-package:.*/exclude-package: []/g" "${clash_config}"
+    sed -i "s/include-package:.*/include-package: []/g" "${clash_config}"
+    # Add packages to the configuration if list_package is not empty
+    if [ -n "${list_package}" ]; then
+      sed -i "s/${mode}:.*/${mode}: [\"${list_package//,/\",\"}\"]/g" "${clash_config}"
+    fi
     sed -i "/tun:/ {n;s/enable: false/enable: true/}" "${clash_config}"
   else
     sed -i "/tun:/ {n;s/enable: true/enable: false/}" "${clash_config}"
@@ -403,6 +406,7 @@ box_run_bin() {
 
       # sync port
       # sed -i "s/port = [0-9]*\.[0-9]*/port = ${tproxy_port}.0/" ${box_dir}/$bin_name/config.toml
+      ${box_dir}/bin/yq '(.inbounds[] | select(.protocol == "dokodemo-door") | .port) = '"${tproxy_port}" -i --output-format=json "${box_dir}/${bin_name}/config.json"
 
       # check configuration file
       if ! [ -f "${box_dir}/${bin_name}/config.toml" ] && ! [ -f "${box_dir}/${bin_name}/config.json" ]; then
@@ -435,6 +439,7 @@ box_run_bin() {
 
       # sync port
       # sed -i "s/port = [0-9]*\.[0-9]*/port = ${tproxy_port}.0/" ${box_dir}/$bin_name/config.toml
+      ${box_dir}/bin/yq '(.inbounds[] | select(.protocol == "dokodemo-door") | .port) = '"${tproxy_port}" -i --output-format=json "${box_dir}/${bin_name}/config.json"
 
       # check configuration file
       if ! [ -f "${box_dir}/${bin_name}/config.toml" ] && ! [ -f "${box_dir}/${bin_name}/config.json" ]; then