correct processing of procd

Добавил автоматическую настройку туннелей awmneziawg и wg

README.md

@@ -1,37 +1,33 @@
 Это альфа версия, может не работать. Обсуждение https://t.me/itdogchat - топик Podkop dev
 
-# Выпил getdomains
-По минимуму
+Если у вас установлен Getdomains, то его следует удалить.
+
+# Удаление GetDomains скриптом
 ```
-rm /etc/hotplug.d/iface/30-vpnroute
-sed -i '/getdomains start/d' /etc/crontabs/root
-rm /tmp/dnsmasq.d/domains.lst
-service getdomains disable
-rm /etc/init.d/getdomains
-ip route del default scope link table vpn
+sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/domain-routing-openwrt/refs/heads/master/getdomains-uninstall.sh)
 ```
 
-Может потребоваться удалить правила фаервола касающиеся vpn_subnet, internal итд.
+Оставляет туннели, зоны, forwarding. А также stubby и dnscrypt. Они не помешают. Конфиг sing-box будет перезаписан в podkop.
 
-# Установка
+# Установка Podkop
 Пакет работает на всех архитектурах.
 Будет точно работать только на OpenWrt 23.05.
 
 Нужен dnsmasq-full. В автоматическом режиме ставится сам. Вручную надо поставить [самостоятельно](https://github.com/itdoginfo/podkop/blob/952dd6215a2a83d65937cf9e33534c42809091ed/install.sh#L20).
 
-## Вручную
-Сделать `opkg update`, чтоб установились зависимости.
-Скачать пакеты `podkop_*.ipk` и `luci-app-podkop_*.ipk` из релиза. `opkg install` сначала первый, потом второй.
-
-```
-/etc/init.d/ucitrack restart
-```
-
 ## Автоматическая
 ```
 sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/main/install.sh)
 ```
 
+Скрипт также предложит выбрать, какой туннель будет использоваться. Для выбранного туннеля будут установлены нужные пакеты, а для Wireguard и AmneziaWG также будет предложена автоматическая настройка - прямо в консоли скрипт запросит данные конфига. Для AmneziaWG можно также выбрать вариант с использованием конфига обычного Wireguard и автоматической обфускацией до AmneziaWG.
+
+Для AmneziaWG скрипт проверяет наличие пакетов под вашу платформу в [стороннем репозитории](https://github.com/Slava-Shchipunov/awg-openwrt/releases), так как в официальном репозитории OpenWRT они отсутствуют, и автоматически их устанавливает.
+
+## Вручную
+Сделать `opkg update`, чтоб установились зависимости.
+Скачать пакеты `podkop_*.ipk` и `luci-app-podkop_*.ipk` из релиза. `opkg install` сначала первый, потом второй.
+
 # Удаление
 ```
 opkg remove luci-app-podkop podkop
@@ -70,29 +66,64 @@ opkg update && opkg install sing-box
 **Custom subnets enable** - Добавить подсети или IP-адреса. Для подсетей задать маску.
 
 # Известные баги
-1. Не работает proxy при режимах main vpn, second proxy
-2. Не всегда отрабатывает ucitrack (применение настроек из luci)
+- [x] Не работает proxy при режимах main vpn, second proxy
+- [x] Не всегда отрабатывает ucitrack (применение настроек из luci). Не удаётся повторить
+- [x] All traffic for IP ломает инет на клиенте. Proxy mode
+- [ ] Не отрабатывает рестарт, при awg и не применяются изменения при awg
+- [ ] awg работает не стабильно
 
 # ToDo
+Сделано
 - [x] Скрипт для автоматической установки.
 - [x] Подсети дискорда.
-- [ ] Удаление getdomains через скрипт. Кроме туннеля и sing-box.
-- [х] Дополнительная вкладка для ещё одного туннеля. Домены, подсети.
-- [ ] Wiki
-- [ ] IPv6
-- [ ] Весь трафик для устойства пускать в туннель\прокси
-- [ ] Исключение для IP, не ходить в туннель\прокси совсем 0x0
-- [ ] Придумать автонастройку DNS через stubby итд. Как лучше это реализовать.
+- [x] Удаление getdomains через скрипт. Кроме туннеля и sing-box.
+- [x] Дополнительная вкладка для ещё одного туннеля. Домены, подсети.
+- [x] Улучшение скрипта автоматической установки. Спрашивать про туннели.
+- [x] Зависимость от dnsmasq-full
+- [x] Весь трафик для устойства пускать в туннель\прокси
+- [x] Исключение для IP, не ходить в туннель\прокси совсем 0x0
+- [x] Врубать галочкой yacd в sing-box
+- [x] Свои списки. Просто список доменов с переносом строки 
+- [x] Свои списки ipv4
+- [x] В nft разделить правило tproxy на маркировку и tproxy
+- [x] Вернуть две цепочки nft
+- [x] Ntp (порт 123) делать маркировку 0x0. По галке
+- [x] Открытый прокси порт на роутере для браузеров
+
+Приоритет 1
+- [x] Переделать на PROCD и выкинуть ucitrack.
+- [x] Нужен дебаг. Restart ucitrack в отдельный скрипт postinst, не отрабатывает.
+- [x] Закомментировать дефолтные значения у list. interface поставить в пустое.
+- [x] Скрипт установки: проверка установлен ли уже podkop. Если да, то просто предлагать обновится без установки тунелей и прокси.
+
+Приоритет 2
+- [ ] Списки доменов и подсетей с роутера
 - [ ] Кнопка обновления списка доменов и подсетей
+- [ ] IPv6
+- [ ] Придумать автонастройку DNS через stubby итд. Как лучше это реализовать.
+- [ ] Удаление подсетей CF из domain sets раз в N часов
+- [x] Автонастройка wireguard по примеру getdomains
+- [x] Автонастройка awg по примеру getdomains
+
+Wiki
+- [x] Тема
+- [x] Изначальное наполнение
+
+Низкий приоритет
+- [ ] Переменная, раз во сколько часов обновлять списки
+- [ ] Галочка, которая режет доступ к doh серверам
+- [ ] Свой конфиг sing-box
+
+Рефактор
+- [ ] Handle для sing-box
+- [ ] Handle для dnsmasq
+- [ ] Формирование json для sing-box на уровне jq, а не шаблонов
 - [ ] Unit тесты (BATS)
 - [ ] Интеграционые тесты бекенда (OpenWrt rootfs + BATS)
-- [ ] Добавить label от конфига vless\ss\etc в luci. Хз как
-- [ ] Удаление подсетей CF из domain sets раз в N часов
-- [ ] Врубать галочкой yacd в sing-box
-- [ ] Свои списки. Вопрос форматирования
-- [ ] В скрипт автоустановки добавить установку AWG по примеру getdomains
-- [ ] Галочка, которая режет доступ к doh серверам
-- [ ] Рефактор dnsmasq restart
+- [ ] RU перевод
+
+Хз как сделать
+- [ ] Добавить label от конфига vless\ss\etc в luci.
 
 # Разработка
 Есть два варианта:

install.sh

@@ -2,9 +2,11 @@
 
 REPO="https://api.github.com/repos/itdoginfo/podkop/releases/latest"
 
+IS_SHOULD_RESTART_NETWORK=false
 DOWNLOAD_DIR="/tmp/podkop"
 mkdir -p "$DOWNLOAD_DIR"
 
+main() {
 wget -qO- "$REPO" | grep -o 'https://[^"]*\.ipk' | while read -r url; do
     filename=$(basename "$url")
     echo "Download $filename..."
@@ -24,12 +26,331 @@ else
     [ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp
 fi
 
-echo "Installed..."
+if [ -f "/etc/init.d/podkop" ]; then
+    printf "\033[32;1mPodkop is already installed. Just upgrade it? (y/n)\033[0m\n"
+    printf "\033[32;1my - Only upgrade podkop\033[0m\n"
+    printf "\033[32;1mn - Upgrade and install proxy or tunnels\033[0m\n"
+
+    while true; do
+        read -r -p '' UPDATE
+        case $UPDATE in
+
+        y)
+            echo "Upgraded podkop..."
+            break
+            ;;
+
+        n)
+            add_tunnel
+            break
+            ;;
+    esac
+    done
+else
+    echo "Installed podkop..."
+    add_tunnel
+fi
+
 opkg install $DOWNLOAD_DIR/podkop*.ipk
 opkg install $DOWNLOAD_DIR/luci-app-podkop*.ipk
 
 rm -f $DOWNLOAD_DIR/podkop*.ipk $DOWNLOAD_DIR/luci-app-podkop*.ipk
 
-#/etc/init.d/ucitrack restart
+if [ "$IS_SHOULD_RESTART_NETWORK" ]; then
+    printf "\033[32;1mRestart network\033[0m\n"
+    /etc/init.d/network restart
+fi
+}
 
-echo "Install sing-box for proxy, or install and configure WG/OpenVPN/AWG/etc for VPN mode"
+add_tunnel() {
+    echo "What type of VPN or proxy will be used? We also can automatically configure Wireguard and Amnezia WireGuard."
+    echo "1) VLESS, Shadowsocks (A sing-box will be installed)"
+    echo "2) Wireguard"
+    echo "3) AmneziaWG"
+    echo "4) OpenVPN"
+    echo "5) OpenConnect"
+    echo "6) Skip this step"
+
+    while true; do
+        read -r -p '' TUNNEL
+        case $TUNNEL in
+
+        1)
+            opkg install sing-box
+            break
+            ;;
+
+        2)
+            opkg install wireguard-tools luci-proto-wireguard luci-app-wireguard
+
+            printf "\033[32;1mDo you want to configure the wireguard interface? (y/n): \033[0m\n"
+            read IS_SHOULD_CONFIGURE_WG_INTERFACE
+
+            if [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "y" ] || [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "Y" ]; then
+                wg_awg_setup Wireguard
+            else
+            printf "\e[1;32mUse these instructions to manual configure https://itdog.info/nastrojka-klienta-wireguard-na-openwrt/\e[0m\n"
+            fi
+
+            break
+            ;;
+
+        3)
+            install_awg_packages
+
+            printf "\033[32;1mThere are no instructions for manual configure yet. Do you want to configure the amneziawg interface? (y/n): \033[0m\n"
+            read IS_SHOULD_CONFIGURE_WG_INTERFACE
+
+            if [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "y" ] || [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "Y" ]; then
+                wg_awg_setup AmneziaWG
+            fi
+
+            break
+            ;;
+
+        4)
+            opkg install opkg install openvpn-openssl luci-app-openvpn
+            printf "\e[1;32mUse these instructions to configure https://itdog.info/nastrojka-klienta-openvpn-na-openwrt/\e[0m\n"
+            break
+            ;;
+
+        5)
+            opkg install opkg install openconnect luci-proto-openconnect
+            printf "\e[1;32mUse these instructions to configure https://itdog.info/nastrojka-klienta-openconnect-na-openwrt/\e[0m\n"
+            break
+            ;;
+
+        6)
+            echo "Skip. Use this if you're installing an upgrade."
+            break
+            ;;
+
+        *)
+            echo "Choose from the following options"
+            ;;
+        esac
+    done
+}
+
+handler_network_restart() {
+    IS_SHOULD_RESTART_NETWORK=true
+}
+
+install_awg_packages() {
+    # Получение pkgarch с наибольшим приоритетом
+    PKGARCH=$(opkg print-architecture | awk 'BEGIN {max=0} {if ($3 > max) {max = $3; arch = $2}} END {print arch}')
+
+    TARGET=$(ubus call system board | jsonfilter -e '@.release.target' | cut -d '/' -f 1)
+    SUBTARGET=$(ubus call system board | jsonfilter -e '@.release.target' | cut -d '/' -f 2)
+    VERSION=$(ubus call system board | jsonfilter -e '@.release.version')
+    PKGPOSTFIX="_v${VERSION}_${PKGARCH}_${TARGET}_${SUBTARGET}.ipk"
+    BASE_URL="https://github.com/Slava-Shchipunov/awg-openwrt/releases/download/"
+
+    AWG_DIR="/tmp/amneziawg"
+    mkdir -p "$AWG_DIR"
+    
+    if opkg list-installed | grep -q kmod-amneziawg; then
+        echo "kmod-amneziawg already installed"
+    else
+        KMOD_AMNEZIAWG_FILENAME="kmod-amneziawg${PKGPOSTFIX}"
+        DOWNLOAD_URL="${BASE_URL}v${VERSION}/${KMOD_AMNEZIAWG_FILENAME}"
+        wget -O "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME" "$DOWNLOAD_URL"
+
+        if [ $? -eq 0 ]; then
+            echo "kmod-amneziawg file downloaded successfully"
+        else
+            echo "Error downloading kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again"
+            exit 1
+        fi
+        
+        opkg install "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME"
+
+        if [ $? -eq 0 ]; then
+            echo "kmod-amneziawg file downloaded successfully"
+        else
+            echo "Error installing kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again"
+            exit 1
+        fi
+    fi
+
+    if opkg list-installed | grep -q amneziawg-tools; then
+        echo "amneziawg-tools already installed"
+    else
+        AMNEZIAWG_TOOLS_FILENAME="amneziawg-tools${PKGPOSTFIX}"
+        DOWNLOAD_URL="${BASE_URL}v${VERSION}/${AMNEZIAWG_TOOLS_FILENAME}"
+        wget -O "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME" "$DOWNLOAD_URL"
+
+        if [ $? -eq 0 ]; then
+            echo "amneziawg-tools file downloaded successfully"
+        else
+            echo "Error downloading amneziawg-tools. Please, install amneziawg-tools manually and run the script again"
+            exit 1
+        fi
+
+        opkg install "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME"
+
+        if [ $? -eq 0 ]; then
+            echo "amneziawg-tools file downloaded successfully"
+        else
+            echo "Error installing amneziawg-tools. Please, install amneziawg-tools manually and run the script again"
+            exit 1
+        fi
+    fi
+    
+    if opkg list-installed | grep -q luci-app-amneziawg; then
+        echo "luci-app-amneziawg already installed"
+    else
+        LUCI_APP_AMNEZIAWG_FILENAME="luci-app-amneziawg${PKGPOSTFIX}"
+        DOWNLOAD_URL="${BASE_URL}v${VERSION}/${LUCI_APP_AMNEZIAWG_FILENAME}"
+        wget -O "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME" "$DOWNLOAD_URL"
+
+        if [ $? -eq 0 ]; then
+            echo "luci-app-amneziawg file downloaded successfully"
+        else
+            echo "Error downloading luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again"
+            exit 1
+        fi
+
+        opkg install "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME"
+
+        if [ $? -eq 0 ]; then
+            echo "luci-app-amneziawg file downloaded successfully"
+        else
+            echo "Error installing luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again"
+            exit 1
+        fi
+    fi
+
+    rm -rf "$AWG_DIR"
+}
+
+wg_awg_setup() {
+    PROTOCOL_NAME=$1
+    printf "\033[32;1mConfigure ${PROTOCOL_NAME}\033[0m\n"
+    if [ "$PROTOCOL_NAME" = 'Wireguard' ]; then
+        INTERFACE_NAME="wg0"
+        CONFIG_NAME="wireguard_wg0"
+        PROTO="wireguard"
+        ZONE_NAME="wg"
+    fi
+
+    if [ "$PROTOCOL_NAME" = 'AmneziaWG' ]; then
+        INTERFACE_NAME="awg0"
+        CONFIG_NAME="amneziawg_awg0"
+        PROTO="amneziawg"
+        ZONE_NAME="awg"
+        
+        echo "Do you want to use AmneziaWG config or basic Wireguard config + automatic obfuscation?"
+        echo "1) AmneziaWG"
+        echo "2) Wireguard + automatic obfuscation"
+        read CONFIG_TYPE
+    fi
+
+    read -r -p "Enter the private key (from [Interface]):"$'\n' WG_PRIVATE_KEY_INT
+
+    while true; do
+        read -r -p "Enter internal IP address with subnet, example 192.168.100.5/24 (from [Interface]):"$'\n' WG_IP
+        if echo "$WG_IP" | egrep -oq '^([0-9]{1,3}\.){3}[0-9]{1,3}/[0-9]+$'; then
+            break
+        else
+            echo "This IP is not valid. Please repeat"
+        fi
+    done
+
+    read -r -p "Enter the public key (from [Peer]):"$'\n' WG_PUBLIC_KEY_INT
+    read -r -p "If use PresharedKey, Enter this (from [Peer]). If your don't use leave blank:"$'\n' WG_PRESHARED_KEY_INT
+    read -r -p "Enter Endpoint host without port (Domain or IP) (from [Peer]):"$'\n' WG_ENDPOINT_INT
+
+    read -r -p "Enter Endpoint host port (from [Peer]) [51820]:"$'\n' WG_ENDPOINT_PORT_INT
+    WG_ENDPOINT_PORT_INT=${WG_ENDPOINT_PORT_INT:-51820}
+    if [ "$WG_ENDPOINT_PORT_INT" = '51820' ]; then
+        echo $WG_ENDPOINT_PORT_INT
+    fi
+
+    if [ "$PROTOCOL_NAME" = 'AmneziaWG' ]; then
+        if [ "$CONFIG_TYPE" = '1' ]; then
+            read -r -p "Enter Jc value (from [Interface]):"$'\n' AWG_JC
+            read -r -p "Enter Jmin value (from [Interface]):"$'\n' AWG_JMIN
+            read -r -p "Enter Jmax value (from [Interface]):"$'\n' AWG_JMAX
+            read -r -p "Enter S1 value (from [Interface]):"$'\n' AWG_S1
+            read -r -p "Enter S2 value (from [Interface]):"$'\n' AWG_S2
+            read -r -p "Enter H1 value (from [Interface]):"$'\n' AWG_H1
+            read -r -p "Enter H2 value (from [Interface]):"$'\n' AWG_H2
+            read -r -p "Enter H3 value (from [Interface]):"$'\n' AWG_H3
+            read -r -p "Enter H4 value (from [Interface]):"$'\n' AWG_H4
+        elif [ "$CONFIG_TYPE" = '2' ]; then
+            #Default values to wg automatic obfuscation
+            AWG_JC=4
+            AWG_JMIN=40
+            AWG_JMAX=70
+            AWG_S1=0
+            AWG_S2=0
+            AWG_H1=1
+            AWG_H2=2
+            AWG_H3=3
+            AWG_H4=4
+        fi
+    fi
+    
+    uci set network.${INTERFACE_NAME}=interface
+    uci set network.${INTERFACE_NAME}.proto=$PROTO
+    uci set network.${INTERFACE_NAME}.private_key=$WG_PRIVATE_KEY_INT
+    uci set network.${INTERFACE_NAME}.listen_port='51821'
+    uci set network.${INTERFACE_NAME}.addresses=$WG_IP
+
+    if [ "$PROTOCOL_NAME" = 'AmneziaWG' ]; then
+        uci set network.${INTERFACE_NAME}.awg_jc=$AWG_JC
+        uci set network.${INTERFACE_NAME}.awg_jmin=$AWG_JMIN
+        uci set network.${INTERFACE_NAME}.awg_jmax=$AWG_JMAX
+        uci set network.${INTERFACE_NAME}.awg_s1=$AWG_S1
+        uci set network.${INTERFACE_NAME}.awg_s2=$AWG_S2
+        uci set network.${INTERFACE_NAME}.awg_h1=$AWG_H1
+        uci set network.${INTERFACE_NAME}.awg_h2=$AWG_H2
+        uci set network.${INTERFACE_NAME}.awg_h3=$AWG_H3
+        uci set network.${INTERFACE_NAME}.awg_h4=$AWG_H4
+    fi
+
+    if ! uci show network | grep -q ${CONFIG_NAME}; then
+        uci add network ${CONFIG_NAME}
+    fi
+
+    uci set network.@${CONFIG_NAME}[0]=$CONFIG_NAME
+    uci set network.@${CONFIG_NAME}[0].name="${INTERFACE_NAME}_client"
+    uci set network.@${CONFIG_NAME}[0].public_key=$WG_PUBLIC_KEY_INT
+    uci set network.@${CONFIG_NAME}[0].preshared_key=$WG_PRESHARED_KEY_INT
+    uci set network.@${CONFIG_NAME}[0].route_allowed_ips='0'
+    uci set network.@${CONFIG_NAME}[0].persistent_keepalive='25'
+    uci set network.@${CONFIG_NAME}[0].endpoint_host=$WG_ENDPOINT_INT
+    uci set network.@${CONFIG_NAME}[0].allowed_ips='0.0.0.0/0'
+    uci set network.@${CONFIG_NAME}[0].endpoint_port=$WG_ENDPOINT_PORT_INT
+    uci commit network
+
+    if ! uci show firewall | grep -q "@zone.*name='${ZONE_NAME}'"; then
+        printf "\033[32;1mZone Create\033[0m\n"
+        uci add firewall zone
+        uci set firewall.@zone[-1].name=$ZONE_NAME
+        uci set firewall.@zone[-1].network=$INTERFACE_NAME
+        uci set firewall.@zone[-1].forward='REJECT'
+        uci set firewall.@zone[-1].output='ACCEPT'
+        uci set firewall.@zone[-1].input='REJECT'
+        uci set firewall.@zone[-1].masq='1'
+        uci set firewall.@zone[-1].mtu_fix='1'
+        uci set firewall.@zone[-1].family='ipv4'
+        uci commit firewall
+    fi
+
+    if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then
+        printf "\033[32;1mConfigured forwarding\033[0m\n"
+        uci add firewall forwarding
+        uci set firewall.@forwarding[-1]=forwarding
+        uci set firewall.@forwarding[-1].name="${ZONE_NAME}-lan"
+        uci set firewall.@forwarding[-1].dest=${ZONE_NAME}
+        uci set firewall.@forwarding[-1].src='lan'
+        uci set firewall.@forwarding[-1].family='ipv4'
+        uci commit firewall
+    fi
+
+    handler_network_restart
+}
+
+main

luci-app-podkop/Makefile

@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-podkop
-PKG_VERSION:=0.1.6
+PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI podkop app

luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js

@@ -90,6 +90,15 @@ return view.extend({
         o.depends('custom_domains_list_enabled', '1');
         o.rmempty = false;
 
+        o = s.taboption('main', form.Flag, 'custom_download_domains_list_enabled', _('URL domains enable'));
+        o.default = '0';
+        o.rmempty = false;
+
+        o = s.taboption('main', form.DynamicList, 'custom_download_domains', _('Your URL domains'));
+        o.placeholder = 'URL';
+        o.depends('custom_download_domains_list_enabled', '1');
+        o.rmempty = false;
+
         o = s.taboption('main', form.Flag, 'custom_subnets_list_enabled', _('Custom subnets enable'));
         o.default = '0';
         o.rmempty = false;
@@ -99,6 +108,49 @@ return view.extend({
         o.depends('custom_subnets_list_enabled', '1');
         o.rmempty = false;
 
+        o = s.taboption('main', form.Flag, 'custom_download_subnets_list_enabled', _('URL subnets enable'));
+        o.default = '0';
+        o.rmempty = false;
+
+        o = s.taboption('main', form.DynamicList, 'custom_download_subnets', _('Your URL subnet'));
+        o.placeholder = 'URL';
+        o.depends('custom_download_subnets_list_enabled', '1');
+        o.rmempty = false;
+
+        o = s.taboption('main', form.Flag, 'all_traffic_from_ip_enabled', _('IP for full redirection'));
+        o.default = '0';
+        o.rmempty = false;
+
+        o = s.taboption('main', form.DynamicList, 'all_traffic_ip', _('Local IPs'));
+        o.placeholder = 'IP';
+        o.depends('all_traffic_from_ip_enabled', '1');
+        o.rmempty = false;
+
+        o = s.taboption('main', form.Flag, 'exclude_from_ip_enabled', _('IP for full exclude'));
+        o.default = '0';
+        o.rmempty = false;
+
+        o = s.taboption('main', form.DynamicList, 'exclude_traffic_ip', _('Local IPs'));
+        o.placeholder = 'IP';
+        o.depends('exclude_from_ip_enabled', '1');
+        o.rmempty = false;
+
+        o = s.taboption('main', form.Flag, 'yacd', _('Yacd enable'), _('http://openwrt.lan:9090/ui'));
+        o.default = '0';
+        o.depends('mode', 'proxy');
+        o.rmempty = false;
+
+        o = s.taboption('main', form.Flag, 'socks5', _('Mixed enable'), _('Browser port: 2080'));
+        o.default = '0';
+        o.depends('mode', 'proxy');
+        o.rmempty = false;
+    
+        o = s.taboption('main', form.Flag, 'exclude_ntp', _('Exclude NTP'), _('For issues with open connections sing-box'));
+        o.default = '0';
+        o.depends('mode', 'proxy');
+        o.rmempty = false;  
+
+        // Second section
         s = m.section(form.TypedSection, 'second');
         s.anonymous = true;
 

luci-app-podkop/root/etc/uci-defaults/50_luci-podkop

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+rm -f /var/luci-indexcache*
+rm -f /tmp/luci-indexcache*
+
+[ -x /etc/init.d/rpcd ] && /etc/init.d/rpcd reload
+
+logger -t "podkop" "$timestamp uci-defaults script executed"
+
+exit 0

podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.1.6
+PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/podkop
 	SECTION:=net
 	CATEGORY:=Network
-	DEPENDS:=+curl +jq +kmod-nft-tproxy +coreutils-base64
+	DEPENDS:=+dnsmasq-full +curl +jq +kmod-nft-tproxy +coreutils-base64
 	TITLE:=Domain routing app
 	URL:=https://itdog.info
 	PKGARCH:=all
@@ -28,25 +28,13 @@ endef
 define Build/Compile
 endef
 
-define Package/podkop/postinst
-#!/bin/sh
-
-if ! uci show ucitrack | grep -q 'podkop'; then
-    uci add ucitrack podkop
-    uci set ucitrack.@podkop[-1].init=podkop
-    uci commit ucitrack
-
-	/etc/init.d/ucitrack restart
-fi
-
-exit 0
-endef
-
 define Package/podkop/prerm
 #!/bin/sh
 
 grep -q "105 podkop" /etc/iproute2/rt_tables && sed -i "/105 podkop/d" /etc/iproute2/rt_tables
 
+rm -f /etc/hotplug.d/iface/50-podkop
+
 exit 0
 endef
 
@@ -57,6 +45,7 @@ endef
 define Package/podkop/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/podkop $(1)/etc/init.d/podkop
+	sed -i "s/VERSION_FROM_MAKEFILE/$(PKG_VERSION)/g" $(1)/etc/init.d/podkop
 
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/etc/config/podkop $(1)/etc/config/podkop

podkop/files/etc/config/podkop

@@ -1,19 +1,28 @@
 config main 'main'
-	option mode 'proxy'
-	option interface 'wg0'
-	option proxy_string 'vless://60e7a3b2-5edb-4c0e-aa96-16702e4e0501@test.test:443/?type=tcp&encryption=none&flow=xtls-rprx-vision&sni=www.microsoft.com&fp=chrome&security=reality&pbk=O-IOLOcpVuzn9Eo3htHi0lxJ4YmeToNb6BhqUC7f7TQ&sid=4283c431d5a2263d#VLESS-podkop'
+	option mode ''
+	option interface ''
+	option proxy_string ''
 	option domain_list_enabled '1'
 	option domain_list 'ru_inside'
 	option subnets_list_enabled '0'
-	list subnets 'twitter'
+	#list subnets 'twitter'
 	option custom_domains_list_enabled '0'
-	list custom_domains 'ifconfig.co'
+	#list custom_domains ''
+	option custom_download_domains_list_enabled '0'
+	#list custom_download_domains ''
 	option custom_subnets_list_enabled '0'
-	list custom_subnets '188.114.96.0/20'
+	#list custom_subnets ''
+	option custom_download_subnets_list_enabled '0'
+	#list custom_download_subnets ''
 	option all_traffic_from_ip_enabled '0'
-	list all_traffic_ip '192.168.56.226'
+	#list all_traffic_ip ''
 	option delist_domains_enabled '0'
-	list delist_domains 'zerossl.com'
+	#list delist_domains ''
+	option exclude_from_ip_enabled '0'
+	#list exclude_traffic_ip ''
+	option yacd '0'
+	option socks5 '0'
+	option exclude_ntp '0'
 
 config second 'second'
 	option second_enable '0'
@@ -21,8 +30,8 @@ config second 'second'
 	option interface 'wg1'
 	option proxy_string ''
 	option domain_list_enabled '0'
-	list domains 'youtube'
+	#list domains 'youtube'
 	option custom_domains_list_enabled '0'
-	list custom_domains 'ifconfig.io'
+	#list custom_domains 'ifconfig.io'
 	option custom_subnets_list_enabled '0'
-	list custom_subnets '-'
+	#list custom_subnets ''

podkop/files/etc/hotplug.d/iface/50-podkop

@@ -1,3 +1,28 @@
 #!/bin/sh
 
-/etc/init.d/podkop add_route_interface
+. /lib/functions.sh
+config_load "/etc/config/podkop"
+. /etc/init.d/podkop
+
+config_get "interface" "main" "interface" "0"
+config_get "mode" "main" "mode" "0"
+if [ "$mode" = "vpn" ] && [ -n "$interface" ]; then
+    add_route_interface "$interface" "podkop"
+fi
+
+if [ "$mode" = "proxy" ]; then
+    echo "Add route for main tproxy"
+    add_route_tproxy podkop
+fi
+
+config_get second_enable "second" "second_enable" "0"
+config_get interface "second" "interface" "0"
+config_get "mode" "second" "mode" "0"
+if [ "$second_enable" -eq "1" ] && [ "$mode" = "vpn" ] && [ -n "$interface" ]; then
+    add_route_interface "$interface" "podkop2"
+fi
+
+if [ "$second_enable" -eq "1" ] && [ "$mode" = "proxy" ]; then
+    echo "Add route for second tproxy"
+    add_route_tproxy podkop2
+fi

podkop/files/etc/init.d/podkop

@@ -1,23 +1,23 @@
 #!/bin/sh /etc/rc.common
 
 START=99
+USE_PROCD=1
 
 script=$(readlink "$initscript")
 NAME="$(basename ${script:-$initscript})"
 config_load "$NAME"
 
 EXTRA_COMMANDS="list_update add_route_interface"
-EXTRA_HELP="        list_update    Updating domain and subnet lists
+EXTRA_HELP="        list_update     Updating domain and subnet lists
         add_route_interface  Adding route for interface
         sing_box_config_vless For test vless string"
 
 cron_job="0 4 * * * /etc/init.d/podkop list_update"
 
-start() {
+start_service() {
     log "Start podkop"
 
     dnsmasqfull
-    ucitrack
     routing_table_create
     add_mark
 
@@ -43,9 +43,13 @@ start() {
                 sing_box_config_vless "$proxy_string" "1603"
             else
                 log "Unsupported proxy type: $proxy_string"
-                exit 1
+                return
             fi
             add_route_tproxy podkop2
+            sing_box_config_check
+            sing_box_uci
+            /etc/init.d/sing-box restart
+            /etc/init.d/sing-box enable
         fi
 
         if [ "$second_enable" -eq "1" ] && [ "$mode" = "vpn" ]; then
@@ -62,7 +66,7 @@ start() {
         log "Proxy mode"
         if ! command -v sing-box >/dev/null 2>&1; then
             log "Sing-box isn't installed. Proxy mode works with sing-box"
-            exit 1
+            return
         fi
 
         # Main - proxy, Second - proxy
@@ -80,7 +84,7 @@ start() {
                 sing_box_config_outbound_vless "$proxy_string" "$outbound_main" main
             else
                 log "Unsupported proxy type: $proxy_string"
-                exit 1
+                return
             fi
 
             config_get proxy_string second "proxy_string"
@@ -90,7 +94,7 @@ start() {
                 sing_box_config_outbound_vless "$proxy_string" "$outbound_second" second
             else
                 log "Unsupported proxy type: $proxy_string"
-                exit 1
+                return
             fi
 
             jq --argjson outbounds "$(jq -s '{"outbounds": (.[0].outbounds + .[1].outbounds)}' "$outbound_main" "$outbound_second")" \
@@ -113,7 +117,7 @@ start() {
                 sing_box_config_vless "$proxy_string" "1602"
             else
                 log "Unsupported proxy type: $proxy_string"
-                exit 1
+                return
             fi
             add_route_tproxy podkop
         fi
@@ -139,7 +143,7 @@ start() {
         ;;
     *)
         log "Requires *vpn* or *proxy* value"
-        exit 1
+        return
         ;;
     esac
 
@@ -154,9 +158,43 @@ start() {
         log "Adding an IP to redirect all traffic"
         config_list_foreach main all_traffic_ip list_all_traffic_from_ip
     fi
+
+    config_get_bool exclude_from_ip_enabled "main" "exclude_from_ip_enabled" "0"
+    if [ "$exclude_from_ip_enabled" -eq 1 ]; then
+        log "Adding an IP for exclusion"
+        config_list_foreach main exclude_traffic_ip list_exclude_traffic_from_ip
+    fi
+
+    config_get_bool yacd "main" "yacd" "0"
+    if [ "$yacd" -eq 1 ]; then
+        log "Yacd enable"
+        jq '.experimental.clash_api = {
+            "external_ui": "ui",
+            "external_controller": "0.0.0.0:9090"
+        }' /etc/sing-box/config.json >/tmp/sing-box-config-tmp.json && mv /tmp/sing-box-config-tmp.json /etc/sing-box/config.json
+        /etc/init.d/sing-box restart
+    fi
+
+    config_get_bool socks5 "main" "socks5" "0"
+    if [ "$socks5" -eq 1 ]; then
+        log "Socks5 local enable port 2080"
+        jq '.inbounds += [{
+            "type": "mixed",
+            "listen": "0.0.0.0",
+            "listen_port": 2080,
+            "set_system_proxy": false
+        }]' /etc/sing-box/config.json >/tmp/sing-box-config-tmp.json && mv /tmp/sing-box-config-tmp.json /etc/sing-box/config.json
+        /etc/init.d/sing-box restart
+    fi
+
+    config_get_bool exclude_ntp "main" "exclude_ntp" "0"
+    if [ "$exclude_ntp" -eq 1 ]; then
+        log "NTP traffic exclude for proxy"
+        nft insert rule inet PodkopTable mangle udp dport 123 return
+    fi
 }
 
-stop() {
+stop_service() {
     log "Stopping the podkop"
     rm -f /tmp/dnsmasq.d/podkop*
     remove_cron_job
@@ -194,16 +232,21 @@ stop() {
     fi
 }
 
-restart() {
+restart_service() {
     stop
     start
 }
 
-reload() {
+reload_service() {
     stop
     start
 }
 
+service_triggers() {
+    log "service_triggers start"
+    procd_add_config_trigger "config.change" "$NAME" "$initscript" reload 'on_config_change'
+}
+
 log() {
     local message="$1"
     local timestamp=$(date +"%Y-%m-%d %H:%M:%S")
@@ -212,6 +255,7 @@ log() {
     local RESET="\033[0m"
 
     echo -e "${CYAN}[$timestamp]${RESET} ${GREEN}$message${RESET}"
+    logger -t "podkop" "$timestamp $message"
 }
 
 add_cron_job() {
@@ -249,6 +293,13 @@ list_update() {
         dnsmasq_config_check podkop-custom-domains.lst
     fi
 
+    config_get_bool custom_download_domains_list_enabled "main" "custom_download_domains_list_enabled" "0"
+    if [ "$custom_download_domains_list_enabled" -eq 1 ]; then
+        log "Adding a custom domains list from URL"
+        add_set "podkop_domains" "main"
+        config_list_foreach main custom_download_domains "list_custom_download_domains_create" "podkop"
+    fi
+
     config_get_bool delist_domains_enabled "main" "delist_domains_enabled" "0"
     if [ "$delist_domains_enabled" -eq 1 ] && [ "$domain_list_enabled" -eq 1 ]; then
         log "Exclude domains from the common list"
@@ -292,6 +343,14 @@ list_update() {
         config_list_foreach main subnets "list_subnets_download"
     fi
 
+    config_get_bool custom_download_subnets_list_enabled "main" "custom_download_subnets_list_enabled" "0"
+    if [ "$custom_download_subnets_list_enabled" -eq 1 ]; then
+        log "Adding a subnets from URL"
+        mkdir -p /tmp/podkop
+        add_set "podkop_subnets" "main"
+        config_list_foreach main custom_download_subnets "list_subnets_download"
+    fi
+
     config_get_bool custom_subnets_list_enabled "main" "custom_subnets_list_enabled" "0"
     if [ "$custom_subnets_list_enabled" -eq 1 ]; then
         log "Adding a custom subnets list"
@@ -312,15 +371,7 @@ dnsmasqfull() {
         log "Dnsmasq-full is not installed. Future: link only"
         log "Use script or:"
         log "cd /tmp/ && /bin/opkg download dnsmasq-full && /bin/opkg remove dnsmasq && /bin/opkg install dnsmasq-full --cache /tmp/ && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp"
-        exit 1
-    fi
-}
-
-ucitrack() {
-    if grep -q "podkop" /etc/config/ucitrack; then
-        log "ucitrack config ok"
-    else
-        log "ucitrack config not found"
+        return
     fi
 }
 
@@ -338,44 +389,47 @@ add_set() {
 
     nft add table inet PodkopTable
     log "Create set $set_name"
-    nft add chain inet PodkopTable mangle_podkop { type filter hook prerouting priority mangle \; policy accept \;}
+    nft add chain inet PodkopTable mangle { type filter hook prerouting priority -150 \; policy accept \;}
     nft add set inet PodkopTable "$set_name" { type ipv4_addr\; flags interval\; auto-merge\; }
     config_get mode "$connect" "mode"
     case "$mode" in
     "vpn")
-        # if nft list table inet PodkopTable | grep -q "chain prerouting"; then
-        #     nft delete chain inet PodkopTable prerouting
-        # fi
-
-        if ! nft list chain inet PodkopTable mangle_podkop | grep -q "ip daddr @"$set_name" meta mark set"; then
+        if ! nft list chain inet PodkopTable mangle | grep -q "ip daddr @"$set_name" meta mark set"; then
             if [ "$connect" = "main" ]; then
-                nft add rule inet PodkopTable mangle_podkop ip daddr @"$set_name" meta mark set 0x105 counter
+                nft add rule inet PodkopTable mangle ip daddr @"$set_name" meta mark set 0x105 counter
             elif [ "$connect" = "second" ]; then
-                nft add rule inet PodkopTable mangle_podkop ip daddr @"$set_name" meta mark set 0x106 counter
+                nft add rule inet PodkopTable mangle ip daddr @"$set_name" meta mark set 0x106 counter
             fi
         fi
         ;;
 
     "proxy")
-        nft add chain inet PodkopTable prerouting { type filter hook prerouting priority mangle \; }
+        nft add chain inet PodkopTable proxy { type filter hook prerouting priority -100 \; }
         if nft list table inet PodkopTable | grep -q "ip daddr @"$set_name" meta l4proto"; then
             log "Nft rule tproxy exists"
         else
             log "Added nft rule tproxy"
             if [ "$connect" = "main" ]; then
-                echo "nft main tproxy"
-                nft add rule inet PodkopTable prerouting iifname "br-lan" ip daddr @"$set_name" meta l4proto tcp meta mark set 0x105 tproxy ip to :1602 counter
-                nft add rule inet PodkopTable prerouting iifname "br-lan" ip daddr @"$set_name" meta l4proto udp meta mark set 0x105 tproxy ip to :1602 counter
+                nft add rule inet PodkopTable mangle ip daddr @"$set_name" meta l4proto tcp meta mark set 0x105 counter
+                nft add rule inet PodkopTable mangle ip daddr @"$set_name" meta l4proto udp meta mark set 0x105 counter
+                if ! ( nft list table inet PodkopTable | grep -q "meta mark 0x00000105 meta l4proto tcp tproxy" ); then
+                    nft add rule inet PodkopTable proxy iifname "br-lan" meta mark 0x105 meta l4proto tcp tproxy ip to :1602 counter
+                    nft add rule inet PodkopTable proxy iifname "br-lan" meta mark 0x105 meta l4proto udp tproxy ip to :1602 counter
+                fi
             elif [ "$connect" = "second" ]; then
-                nft add rule inet PodkopTable prerouting iifname "br-lan" ip daddr @"$set_name" meta l4proto tcp meta mark set 0x106 tproxy ip to :1603 counter
-                nft add rule inet PodkopTable prerouting iifname "br-lan" ip daddr @"$set_name" meta l4proto udp meta mark set 0x106 tproxy ip to :1603 counter
+                nft add rule inet PodkopTable mangle ip daddr @"$set_name" meta l4proto tcp meta mark set 0x106 counter
+                nft add rule inet PodkopTable mangle ip daddr @"$set_name" meta l4proto udp meta mark set 0x106 counter
+                if ! ( nft list table inet PodkopTable | grep -q "meta mark 0x00000106 meta l4proto tcp tproxy" ); then
+                    nft add rule inet PodkopTable proxy iifname "br-lan" meta mark 0x106 meta l4proto tcp tproxy ip to :1603 counter
+                    nft add rule inet PodkopTable proxy iifname "br-lan" meta mark 0x106 meta l4proto udp tproxy ip to :1603 counter
+                fi
             fi
         fi
         ;;
 
     *)
         log "Requires *vpn* or *proxy* value"
-        exit 1
+        return
         ;;
     esac
 }
@@ -383,12 +437,22 @@ add_set() {
 add_route_interface() {
     local interface="$1"
     local table="$2"
-    local retry_count=0
-    local max_retries=20
+    local retry_count_route=0
+    local max_retries=10
+
+    if ! ip link show "$interface" >/dev/null 2>&1; then
+    log "Interface "$interface" undetected, wait 10 sec..."
+    sleep 10
+
+        if ! ip link show "$interface" >/dev/null 2>&1; then
+            log "Interface "$interface" undetected. exit"
+            return
+        fi
+    fi
 
     if ! ip link show "$interface" >/dev/null 2>&1; then
         log "Interface "$interface" does not exist, not possible to create a route"
-        exit 1
+        return
     fi
 
     if ip route show table $table | grep -q "^default dev"; then
@@ -397,11 +461,11 @@ add_route_interface() {
     fi
 
     log "Added route for "$interface""
-    while [ $retry_count -lt $max_retries ]; do
+    while [ $retry_count_route -lt $max_retries ]; do
         if ip route add table $table default dev "$interface" 2>&1 | grep -q "Network is down"; then
-            log "Error: Network is down. Let's try again in 3 seconds"
+            log "Attempt $retry_count_route: Interface "$interface" is down, retrying in 3 seconds..."
             sleep 3
-            retry_count=$((retry_count + 1))
+            retry_count_route=$((retry_count_route + 1))
         else
             log "Route for "$interface" added"
             return 0
@@ -409,7 +473,7 @@ add_route_interface() {
     done
 
     log "The maximum number of attempts has been exceeded. Failed to add a route."
-    exit 1
+    return
 }
 
 add_route_tproxy() {
@@ -460,7 +524,7 @@ lists_domains_download() {
         ;;
     *)
         log "Unidentified list of domains"
-        exit 1
+        return
         ;;
     esac
 
@@ -500,7 +564,7 @@ lists_services_download() {
         ;;
     *)
         log "Unidentified list of domains"
-        exit 1
+        return
         ;;
     esac
 
@@ -547,8 +611,12 @@ list_subnets_download() {
         URL=$DISCORD_SUBNETS
         ;;
     *)
-        log "Unidentified list of subnets"
-        exit 1
+        log "Custom URL for subnet"
+        if curl --output /dev/null --silent --head --fail "$URL"; then
+            log "URL is valid"
+        else
+            log "URL $URL is not valid"
+        fi
         ;;
     esac
 
@@ -566,6 +634,20 @@ list_custom_domains_create() {
     log "$domain added to the list"
 }
 
+list_custom_download_domains_create() {
+    local URL="$1"
+    local name="$2"
+    local filename=$(basename "$URL")
+    local config="/tmp/dnsmasq.d/${name}-${filename}.lst"
+
+    rm -f $config
+    curl -f "$URL" --output "/tmp/podkop/${filename}"
+    while IFS= read -r domain; do
+        echo "nftset=/$domain/4#inet#PodkopTable#${name}_domains" >>$config
+    done <"/tmp/podkop/$filename"
+    dnsmasq_config_check ${name}-${filename}.lst
+}
+
 list_custom_subnets_create() {
     local subnet="$1"
     local name="$2"
@@ -574,18 +656,49 @@ list_custom_subnets_create() {
 
 list_all_traffic_from_ip() {
     local ip="$1"
-    if ! nft list chain inet PodkopTable mangle_podkop | grep -q "ip saddr $ip"; then
-        nft add rule inet PodkopTable mangle_podkop ip saddr $ip meta mark set 0x105
+    if ! nft list chain inet PodkopTable mangle | grep -q "ip saddr $ip"; then
+        config_get mode "main" "mode" "0"
+        if [ "$mode" = "vpn" ]; then
+            nft insert rule inet PodkopTable mangle ip saddr $ip meta mark set 0x105 counter
+        elif [ "$mode" = "proxy" ]; then
+            nft add set inet PodkopTable localv4 { type ipv4_addr\; flags interval\; }
+            nft add element inet PodkopTable localv4 { \
+                0.0.0.0/8, \
+                10.0.0.0/8, \
+                127.0.0.0/8, \
+                169.254.0.0/16, \
+                172.16.0.0/12, \
+                192.0.0.0/24, \
+                192.0.2.0/24, \
+                192.88.99.0/24, \
+                192.168.0.0/16, \
+                198.18.0.0/15, \
+                198.51.100.0/24, \
+                203.0.113.0/24, \
+                224.0.0.0/4, \
+                240.0.0.0-255.255.255.255 }
+            nft insert rule inet PodkopTable mangle ip saddr $ip meta l4proto { tcp, udp } meta mark set 0x105 counter
+            nft insert rule inet PodkopTable mangle ip saddr $ip ip daddr @localv4 return
+        fi
+    fi
+}
+
+list_exclude_traffic_from_ip() {
+    local ip="$1"
+    if ! nft list chain inet PodkopTable mangle | grep -q "ip saddr $ip"; then
+        nft insert rule inet PodkopTable mangle ip saddr $ip return
     fi
 }
 
 list_delist_domains() {
     local domain="$1"
 
-    if [ -f " /tmp/dnsmasq.d/podkop-domains.lst" ]; then
+    if [ -f "/tmp/dnsmasq.d/podkop-domains.lst" ]; then
         sed -i "/$domain/d" /tmp/dnsmasq.d/podkop-domains.lst
         nft flush set inet PodkopTable podkop_domains
         log "Strings containing '$domain' have been excluded from the list"
+    else
+        log "Config /tmp/dnsmasq.d/podkop-domains.lst not exists"
     fi
 }
 
@@ -605,7 +718,7 @@ dnsmasq_config_check() {
     local config="$1"
     if ! /usr/sbin/dnsmasq --conf-file=/tmp/dnsmasq.d/$config --test 2>&1 | grep -q "syntax check OK"; then
         log "Dnsmasq config $config contains errors. Break"
-        exit 1
+        return
     fi
 }
 
@@ -677,6 +790,7 @@ sing_box_config_vless() {
     security=$(get_param "security")
     pbk=$(get_param "pbk")
     sid=$(get_param "sid")
+    encoding=$(get_param "packetEncoding")
     alpn=$(echo "$(get_param "alpn" | sed 's/%2C/,/g; s/%2F/\//g')" | jq -R -s -c 'split(",")' | sed 's/\\n//g')
     label=$(echo "$STRING" | cut -d'#' -f2)
 
@@ -693,6 +807,7 @@ sing_box_config_vless() {
         --arg pbk "$pbk" \
         --arg sid "$sid" \
         --argjson alpn "$alpn" \
+        --arg encoding "$encoding" \
         --arg listen_port "$listen_port" \
         '.inbounds[] |=
         if .type == "tproxy" then
@@ -706,6 +821,7 @@ sing_box_config_vless() {
             .uuid = $uuid |
             if $security == "reality" then 
                 if $flow == "" then del(.flow) else .flow = $flow end |
+                if $encoding == "" then del(.packet_encoding) else .packet_encoding = $encoding end |
                 .tls.server_name = $sni |
                 .tls.utls.fingerprint = $fp |
                 .tls.reality.public_key = $pbk |
@@ -778,6 +894,7 @@ sing_box_config_outbound_vless() {
     pbk=$(get_param "pbk")
     sid=$(get_param "sid")
     alpn=$(echo "$(get_param "alpn" | sed 's/%2C/,/g; s/%2F/\//g')" | jq -R -s -c 'split(",")' | sed 's/\\n//g')
+    encoding=$(get_param "packetEncoding")
     label=$(echo "$STRING" | cut -d'#' -f2)
 
     template_config="/etc/podkop/sing-box-vless-outbound-template.json"
@@ -793,6 +910,7 @@ sing_box_config_outbound_vless() {
         --arg pbk "$pbk" \
         --arg sid "$sid" \
         --argjson alpn "$alpn" \
+        --arg encoding "$encoding" \
         --arg tag "$name" \
         '.outbounds[] |= 
            (.server = $server |
@@ -800,6 +918,7 @@ sing_box_config_outbound_vless() {
             .uuid = $uuid |
             if $security == "reality" then 
                 if $flow == "" then del(.flow) else .flow = $flow end |
+                if $encoding == "" then del(.packet_encoding) else .packet_encoding = $encoding end |
                 .tls.server_name = $sni |
                 .tls.utls.fingerprint = $fp |
                 .tls.reality.public_key = $pbk |
@@ -824,6 +943,6 @@ sing_box_config_outbound_vless() {
 sing_box_config_check() {
     if ! sing-box -c /etc/sing-box/config.json check >/dev/null 2>&1; then
         log "Sing-box configuration is invalid"
-        exit 1
+        return
     fi
-}
+}