fix ping host ip type

install.sh

@@ -69,7 +69,7 @@ is_log_dir=/var/log/$is_core
 is_sh_bin=/usr/local/bin/$is_core
 is_sh_dir=$is_core_dir/sh
 is_sh_repo=$author/$is_core
-is_pkg="wget unzip jq qrencode"
+is_pkg="wget unzip jq"
 is_config_json=$is_core_dir/config.json
 tmp_var_lists=(
     tmpcore
@@ -141,7 +141,7 @@ install_pkg() {
         msg warn "安装依赖包 >${pkg}"
         $cmd install -y $pkg &>/dev/null
         if [[ $? != 0 ]]; then
-            [[ $cmd == yum ]] && yum install epel-release -y &>/dev/null
+            [[ $cmd =~ yum ]] && yum install epel-release -y &>/dev/null
             $cmd update -y &>/dev/null
             $cmd install -y $pkg &>/dev/null
             [[ $? == 0 ]] && >$is_pkg_ok

src/caddy.sh

@@ -14,21 +14,21 @@ EOF
         ;;
     *ws*)
         cat >${is_caddy_site_file} <<<"
-${host} {
+${host}:${tlsport} {
     reverse_proxy ${path} 127.0.0.1:${port}
     import ${is_caddy_site_file}.add
 }"
         ;;
     *h2*)
         cat >${is_caddy_site_file} <<<"
-${host} {
+${host}:${tlsport} {
     reverse_proxy ${path} h2c://127.0.0.1:${port}
     import ${is_caddy_site_file}.add
 }"
         ;;
     *grpc*)
         cat >${is_caddy_site_file} <<<"
-${host} {
+${host}:${tlsport} {
     reverse_proxy /${path}/* h2c://127.0.0.1:${port}
     import ${is_caddy_site_file}.add
 }"

src/core.sh

@@ -372,7 +372,7 @@ create() {
             api add $is_json_file $is_dynamic_port_link_file &>/dev/null
         fi
         # caddy auto tls
-        [[ $is_caddy && $host ]] && {
+        [[ $is_caddy && $host && ! $is_no_auto_tls ]] && {
             create caddy $net
         }
         # restart core
@@ -517,10 +517,23 @@ change() {
     1)
         # new port
         is_new_port=$3
-        [[ $host ]] && err "($is_config_file) 不支持更改端口, 因为没啥意义."
+        [[ $host && ! $is_caddy ]] && err "($is_config_file) 不支持更改端口, 因为没啥意义."
+        if [[ $is_new_port && ! $is_auto ]]; then
+            [[ ! $(is_test port $is_new_port) ]] && err "请输入正确的端口, 可选(1-65535)"
+            [[ $is_new_port != 443 && $(is_test port_used $is_new_port) ]] && err "无法使用 ($is_new_port) 端口"
+        fi
         [[ $is_auto ]] && get_port && is_new_port=$tmp_port
         [[ ! $is_new_port ]] && ask string is_new_port "请输入新端口:"
+        if [[ $is_caddy && $host ]]; then
+            net=$is_old_net
+            tlsport=$is_new_port
+            load caddy.sh
+            caddy_config $net
+            manage restart caddy &
+            info
+        else
             add $net $is_new_port
+        fi
         ;;
     2)
         # new host
@@ -828,6 +841,7 @@ api() {
     [[ ! $1 ]] && err "无法识别 API 的参数."
     [[ $is_core_stop ]] && {
         warn "$is_core_name 当前处于停止状态."
+        is_api_fail=1
         return
     }
     case $1 in
@@ -1152,7 +1166,7 @@ get() {
         is_file_str=$2
         [[ ! $is_file_str ]] && is_file_str='.json$'
         # is_all_json=("$(ls $is_conf_dir | egrep $is_file_str)")
-        readarray -t is_all_json <<<$(ls $is_conf_dir | egrep -i "$is_file_str" | sed '/dynamic-port-.*-link/d' | head -233) # limit max 233 lines for show.
+        readarray -t is_all_json <<<"$(ls $is_conf_dir | egrep -i "$is_file_str" | sed '/dynamic-port-.*-link/d' | head -233)" # limit max 233 lines for show.
         [[ ! $is_all_json ]] && err "无法找到相关的配置文件: $2"
         [[ ${#is_all_json[@]} -eq 1 ]] && is_config_file=$is_all_json && is_auto_get_config=1
         [[ ! $is_config_file ]] && {
@@ -1196,7 +1210,11 @@ get() {
                 is_dynamic_port_range=$(jq -r '.inbounds[0].port' $is_dynamic_port_file)
                 [[ $? != 0 ]] && err "无法读取动态端口文件: $is_dynamic_port"
             fi
-            [[ $is_client && $host ]] && port=443
+            if [[ $is_caddy && $host && -f $is_caddy_conf/$host.conf ]]; then
+                tmp_tlsport=$(egrep -o "$host:[1-9][0-9]?+" $is_caddy_conf/$host.conf | sed s/.*://)
+            fi
+            [[ $tmp_tlsport ]] && tlsport=$tmp_tlsport
+            [[ $is_client && $host ]] && port=$tlsport
             get protocol $is_protocol-$net
         fi
         ;;
@@ -1244,7 +1262,7 @@ get() {
         dokodemo-door*)
             is_protocol=dokodemo-door
             net=door
-            json_str='settings:{port:'\"$door_port\"',address:'\"$door_addr\"',network:"tcp,udp"}'
+            json_str='settings:{port:'"$door_port"',address:'\"$door_addr\"',network:"tcp,udp"}'
             ;;
         *http*)
             is_protocol=http
@@ -1365,7 +1383,9 @@ get() {
         [[ $? != 0 ]] && err "无法生成 Shadowsocks 2022 密码, 请安装 openssl."
         ;;
     ping)
-        is_host_dns=$(ping $host -c 1 -W 2 | head -1)
+        is_ip_type="-4"
+        [[ $(grep ":" <<<$ip) ]] && is_ip_type="-6"
+        is_host_dns=$(ping $host $is_ip_type -c 1 -W 2 | head -1)
         ;;
     log | logerr)
         msg "\n 提醒: 按 $(_green Ctrl + C) 退出\n"
@@ -1393,7 +1413,7 @@ get() {
             return
         }
         is_no_manage_msg=1
-        if [[ $is_core_stop ]]; then
+        if [[ ! $(pgrep -f $is_core_bin) ]]; then
             _yellow "\n测试运行 $is_core_name ..\n"
             manage start &>/dev/null
             if [[ $is_run_fail == $is_core ]]; then
@@ -1406,7 +1426,7 @@ get() {
             _green "\n$is_core_name 正在运行, 跳过测试\n"
         fi
         if [[ $is_caddy ]]; then
-            if [[ $is_caddy_stop ]]; then
+            if [[ ! $(pgrep -f $is_caddy_bin) ]]; then
                 _yellow "\n测试运行 Caddy ..\n"
                 manage start caddy &>/dev/null
                 if [[ $is_run_fail == 'caddy' ]]; then
@@ -1434,7 +1454,7 @@ info() {
     tcp | kcp | quic)
         is_can_change=(0 1 5 7)
         is_info_show=(0 1 2 3 4 5)
-        is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-${net}-$is_addr\"',add:'\"$is_addr\"',port:'\"$port\"',id:'\"$uuid\"',net:'\"$net\"',type:'\"$header_type\"',path:'\"$kcp_seed\"'}' <<<{})
+        is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-${net}-$is_addr\"',add:'\"$is_addr\"',port:'\"$port\"',id:'\"$uuid\"',aid:"0",net:'\"$net\"',type:'\"$header_type\"',path:'\"$kcp_seed\"'}' <<<{})
         is_url=vmess://$(echo -n $is_vmess_url | base64 -w 0)
         is_tmp_port=$port
         [[ $is_dynamic_port ]] && {
@@ -1450,12 +1470,12 @@ info() {
     ss)
         is_can_change=(0 1 4 6)
         is_info_show=(0 1 2 10 11)
-        is_url="ss://$(echo -n ${ss_method}:${ss_password} | base64 -w 0)@${is_addr}:${port}#233boy-ss-${is_addr}"
+        is_url="ss://$(echo -n ${ss_method}:${ss_password} | base64 -w 0)@${is_addr}:${port}#233boy-$net-${is_addr}"
         is_info_str=($is_protocol $is_addr $port $ss_password $ss_method)
         ;;
     ws | h2 | grpc)
         is_color=45
-        is_can_change=(0 2 3 5)
+        is_can_change=(0 1 2 3 5)
         is_info_show=(0 1 2 3 4 6 7 8)
         is_url_path=path
         [[ $net == 'grpc' ]] && {
@@ -1463,26 +1483,26 @@ info() {
             is_url_path=serviceName
         }
         [[ $is_protocol == 'vmess' ]] && {
-            is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-$host\"',add:'\"$is_addr\"',port:'\"443\"',id:'\"$uuid\"',net:'\"$net\"',host:'\"$host\"',path:'\"$path\"',tls:'\"tls\"'}' <<<{})
+            is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-$net-$host\"',add:'\"$is_addr\"',port:'\"$tlsport\"',id:'\"$uuid\"',aid:"0",net:'\"$net\"',host:'\"$host\"',path:'\"$path\"',tls:'\"tls\"'}' <<<{})
             is_url=vmess://$(echo -n $is_vmess_url | base64 -w 0)
         } || {
             [[ $is_trojan ]] && {
                 uuid=$trojan_password
-                is_info_str=($is_protocol $is_addr 443 $trojan_password $net $host $path 'tls')
-                is_can_change=(0 2 3 4)
+                is_info_str=($is_protocol $is_addr $tlsport $trojan_password $net $host $path 'tls')
+                is_can_change=(0 1 2 3 4)
                 is_info_show=(0 1 2 10 4 6 7 8)
             }
-            is_url="$is_protocol://$uuid@$host:443?encryption=none&security=tls&type=$net&host=$host&${is_url_path}=$(sed 's#/#%2F#g' <<<$path)#233boy-$host"
+            is_url="$is_protocol://$uuid@$host:$tlsport?encryption=none&security=tls&type=$net&host=$host&${is_url_path}=$(sed 's#/#%2F#g' <<<$path)#233boy-$net-$host"
         }
         [[ $is_caddy ]] && is_can_change+=(13)
-        is_info_str=($is_protocol $is_addr 443 $uuid $net $host $path 'tls')
+        is_info_str=($is_protocol $is_addr $tlsport $uuid $net $host $path 'tls')
         ;;
     reality)
         is_color=41
         is_can_change=(0 1 5 10 11)
         is_info_show=(0 1 2 3 15 8 16 17 18)
         is_info_str=($is_protocol $is_addr $port $uuid xtls-rprx-vision reality $is_servername "ios" $is_public_key)
-        is_url="$is_protocol://$uuid@$ip:$port?encryption=none&security=reality&flow=xtls-rprx-vision&type=tcp&sni=$is_servername&pbk=$is_public_key&fp=ios#233boy-$is_addr"
+        is_url="$is_protocol://$uuid@$ip:$port?encryption=none&security=reality&flow=xtls-rprx-vision&type=tcp&sni=$is_servername&pbk=$is_public_key&fp=ios#233boy-$net-$is_addr"
         ;;
     door)
         is_can_change=(0 1 8 9)
@@ -1493,7 +1513,7 @@ info() {
         is_can_change=(0 1 15 4)
         is_info_show=(0 1 2 19 10)
         is_info_str=($is_protocol $is_addr $port $is_socks_user $is_socks_pass)
-        is_url="socks://$(echo -n ${is_socks_user}:${is_socks_pass} | base64 -w 0)@${is_addr}:${port}#233boy-socks-${is_addr}"
+        is_url="socks://$(echo -n ${is_socks_user}:${is_socks_pass} | base64 -w 0)@${is_addr}:${port}#233boy-$net-${is_addr}"
         ;;
     http)
         is_can_change=(0 1)
@@ -1553,7 +1573,11 @@ url_qr() {
             link="https://233boy.github.io/tools/qr.html#${is_url}"
             msg "\n------------- $is_config_name & QR code 二维码 -------------"
             msg
+            if [[ $(type -P qrencode) ]]; then
                 qrencode -t ANSI "${is_url}"
+            else
+                msg "请安装 qrencode: $(_green "$cmd update -y; $cmd install qrencode -y")"
+            fi
             msg
             msg "如果无法正常显示或识别, 请使用下面的链接来生成二维码:"
             msg "\n\e[4;${is_color}m${link}\e[0m\n"

src/help.sh

@@ -79,9 +79,9 @@ about() {
     ####### 要点13脸吗只会改我链接的小人 #######
     unset c n m s b
     msg
-    msg "Blog: $(msg_ul https://233boy.com)"
-    msg "Chat: $(msg_ul https://t.me/tg233boy)"
-    msg "Chanel: $(msg_ul https://t.me/tg2333)"
+    msg "网站: $(msg_ul https://233boy.com)"
+    msg "频道: $(msg_ul https://t.me/tg2333)"
+    msg "群组: $(msg_ul https://t.me/tg233boy)"
     msg "Github: $(msg_ul https://github.com/${is_sh_repo})"
     msg "Twitter: $(msg_ul https://twitter.com/ai233boy)"
     msg "$is_core_name site: $(msg_ul https://www.v2fly.org)"

src/init.sh

@@ -83,6 +83,7 @@ is_caddy_repo=caddyserver/caddy
 is_caddyfile=$is_caddy_dir/Caddyfile
 is_caddy_conf=$is_caddy_dir/$author
 is_caddy_service=$(systemctl list-units --full -all | grep caddy.service)
+tlsport=443
 
 # core ver
 is_core_ver=$($is_core_bin version | head -n1 | cut -d " " -f1-2)

v2ray.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 args=$@
-is_sh_ver=v4.04
+is_sh_ver=v4.12
 
 . /etc/v2ray/sh/src/init.sh