fix log display in UI

Merge pull request #80 from Roddy-D/main

sing-box.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 args=$@
-is_sh_ver=v1.10
+is_sh_ver=v1.13
 
 . /etc/sing-box/sh/src/init.sh

src/core.sh

@@ -655,7 +655,7 @@ del() {
                 [[ ! $old_host ]] && return # no host exist or not set new host;
                 is_del_host=$old_host
             }
-            [[ $is_del_host && $host != $old_host && ! $is_no_auto_tls ]] && {
+            [[ $is_del_host && $host != $old_host && -f $is_caddy_conf/$is_del_host.conf ]] && {
                 rm -rf $is_caddy_conf/$is_del_host.conf $is_caddy_conf/$is_del_host.conf.add
                 [[ ! $is_new_json ]] && manage restart caddy &
             }
@@ -1199,7 +1199,11 @@ get() {
         fi
         ;;
     ssss | ss2022)
+        if [[ $(grep 128 <<<$ss_method) ]]; then
+            $is_core_bin generate rand 16 --base64
+        else
             $is_core_bin generate rand 32 --base64
+        fi
         ;;
     ping)
         # is_ip_type="-4"
@@ -1532,7 +1536,8 @@ is_main_menu() {
             _try_enable_bbr
             ;;
         2)
-            get log
+            load log.sh
+            log_set
             ;;
         3)
             get test-run

src/dns.sh

@@ -8,6 +8,9 @@ is_dns_list=(
     none
 )
 dns_set() {
+    if [[ $(echo -e "1.11.99\n$is_core_ver" | sort -V | head -n1) == '1.11.99' ]]; then
+        is_dns_new=1
+    fi
     if [[ $1 ]]; then
         case ${1,,} in
         11 | 1111)
@@ -46,11 +49,34 @@ dns_set() {
             ask string is_dns_use "请输入 DNS: "
         fi
     fi
+    is_dns_use_bak=$is_dns_use
     if [[ $is_dns_use == "none" ]]; then
         cat <<<$(jq '.dns={}' $is_config_json) >$is_config_json
+    else
+        if [[ $is_dns_new ]]; then
+            dns_set_server $is_dns_use
+            cat <<<$(jq '.dns.servers=[{type:"'$is_dns_type'",server:"'$is_dns_use'",domain_resolver:"local"},{tag:"local",type:"local"}]' $is_config_json) >$is_config_json
         else
             cat <<<$(jq '.dns.servers=[{address:"'$is_dns_use'",address_resolver:"local"},{tag:"local",address:"local"}]' $is_config_json) >$is_config_json
         fi
+    fi
     manage restart &
-    msg "\n已更新 DNS 为: $(_green $is_dns_use)\n"
+    msg "\n已更新 DNS 为: $(_green $is_dns_use_bak)\n"
+}
+dns_set_server() {
+    if [[ $(grep '://' <<<$1) ]]; then
+        is_tmp_dns_set=($(awk -F '://|/' '{print $1, $2}' <<<${1,,}))
+        case ${is_tmp_dns_set[0]} in
+        tcp | udp | tls | https | quic | h3)
+            is_dns_use=${is_tmp_dns_set[1]}
+            is_dns_type=${is_tmp_dns_set[0]}
+            ;;
+        *)
+            err "无法识别 DNS 类型!"
+            ;;
+        esac
+    else
+        is_dns_use=$1
+        is_dns_type=udp
+    fi
 }