bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Skip missing IPs while generating URI and QR codes

Browse Source
This commit is contained in:
Whispering Wind
2025-02-12 00:05:36 +03:30
committed by GitHub
parent ff757bb71b
commit 436f73154b
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/scripts/hysteria2/show_user_uri.sh
View File

@ -37,6 +37,18 @@ show_uri() {
load_hysteria2_env load_hysteria2_env
load_hysteria2_ips load_hysteria2_ips
available_ip4=true
available_ip6=true
if [[ -z "$IP4" || "$IP4" == "None" ]]; then
available_ip4=false
fi
if [[ -z "$IP6" || "$IP6" == "None" ]]; then
available_ip6=false
fi
while [[ "$#" -gt 0 ]]; do while [[ "$#" -gt 0 ]]; do
case $1 in case $1 in
@ -87,33 +99,37 @@ show_uri() {
} }
if [ "$show_all" = true ]; then if [ "$show_all" = true ]; then
URI=$(generate_uri 4 "$IP4") if [ "$available_ip4" = true ]; then
URI6=$(generate_uri 6 "$IP6")
echo -e "\nIPv4:\n$URI\n"
echo -e "\nIPv6:\n$URI6\n"
else
if [ "$ip_version" -eq 4 ]; then
URI=$(generate_uri 4 "$IP4") URI=$(generate_uri 4 "$IP4")
echo -e "\nIPv4:\n$URI\n" echo -e "\nIPv4:\n$URI\n"
elif [ "$ip_version" -eq 6 ]; then fi
if [ "$available_ip6" = true ]; then
URI6=$(generate_uri 6 "$IP6")
echo -e "\nIPv6:\n$URI6\n"
fi
else
if [ "$ip_version" -eq 4 ] && [ "$available_ip4" = true ]; then
URI=$(generate_uri 4 "$IP4")
echo -e "\nIPv4:\n$URI\n"
elif [ "$ip_version" -eq 6 ] && [ "$available_ip6" = true ]; then
URI6=$(generate_uri 6 "$IP6") URI6=$(generate_uri 6 "$IP6")
echo -e "\nIPv6:\n$URI6\n" echo -e "\nIPv6:\n$URI6\n"
else else
echo "Invalid IP version. Use 4 for IPv4 or 6 for IPv6." echo "Invalid IP version or no available IP for the requested version."
exit 1 exit 1
fi fi
fi fi
if [ "$generate_qrcode" = true ]; then if [ "$generate_qrcode" = true ]; then
cols=$(tput cols) cols=$(tput cols)
if [ -n "$URI" ]; then if [ "$available_ip4" = true ] && [ -n "$URI" ]; then
qr1=$(echo -n "$URI" | qrencode -t UTF8 -s 3 -m 2) qr1=$(echo -n "$URI" | qrencode -t UTF8 -s 3 -m 2)
echo -e "\nIPv4 QR Code:\n" echo -e "\nIPv4 QR Code:\n"
echo "$qr1" | while IFS= read -r line; do echo "$qr1" | while IFS= read -r line; do
printf "%*s\n" $(( (${#line} + cols) / 2)) "$line" printf "%*s\n" $(( (${#line} + cols) / 2)) "$line"
done done
fi fi
if [ -n "$URI6" ]; then if [ "$available_ip6" = true ] && [ -n "$URI6" ]; then
qr2=$(echo -n "$URI6" | qrencode -t UTF8 -s 3 -m 2) qr2=$(echo -n "$URI6" | qrencode -t UTF8 -s 3 -m 2)
echo -e "\nIPv6 QR Code:\n" echo -e "\nIPv6 QR Code:\n"
echo "$qr2" | while IFS= read -r line; do echo "$qr2" | while IFS= read -r line; do