From 974fe8736d8586b32970d8ef42071d54e08ca96f Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Tue, 1 Apr 2025 15:22:17 +0000
Subject: [PATCH] Adapt to the new DNS configuration format in Sing-box v1.12
 alpha.18+.

---
 docker_init.sh | 4 ++--
 sing-box.sh    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker_init.sh b/docker_init.sh
index c74a4fa..847bbbd 100644
--- a/docker_init.sh
+++ b/docker_init.sh
@@ -34,7 +34,7 @@ check_latest_sing-box() {
 
   # 获取最终版本号
   local VERSION=$(wget --no-check-certificate --tries=2 --timeout=3 -qO- https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v]' -v var="tag_name.*$FORCE_VERSION" '$0 ~ var {print $5; exit}')
-  VERSION=${VERSION:-'1.12.0-alpha.18'}
+  VERSION=${VERSION:-'1.12.0-alpha.23'}
 
   echo "$VERSION"
 }
@@ -66,7 +66,7 @@ install() {
   if [[ "$SERVER_IP" =~ : ]]; then
     local STRATEGY=prefer_ipv6
   else
-    local STRATEGY=prefer_ipv4
+    local STRATEGY=ipv4_only
   fi
 
   local REALITY_KEYPAIR=$(${WORK_DIR}/sing-box generate reality-keypair) && REALITY_PRIVATE=$(awk '/PrivateKey/{print $NF}' <<< "$REALITY_KEYPAIR") && REALITY_PUBLIC=$(awk '/PublicKey/{print $NF}' <<< "$REALITY_KEYPAIR")
diff --git a/sing-box.sh b/sing-box.sh
index dabf3c3..9913ff1 100644
--- a/sing-box.sh
+++ b/sing-box.sh
@@ -552,7 +552,7 @@ check_install() {
     else
       local VERSION_LATEST=$(wget --no-check-certificate --tries=2 --timeout=3 -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v-]' '/tag_name/{print $5}' | sort -Vr | sed -n '1p')
       local ONLINE=$(wget --no-check-certificate --tries=2 --timeout=3 -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v]' -v var="tag_name.*$VERSION_LATEST" '$0 ~ var {print $5; exit}')
-      ONLINE=${ONLINE:-'1.11.0'}
+      ONLINE=${ONLINE:-'1.12.0'}
     fi
     wget --no-check-certificate --continue ${GH_PROXY}https://github.com/SagerNet/sing-box/releases/download/v$ONLINE/sing-box-$ONLINE-linux-$SING_BOX_ARCH.tar.gz -qO- | tar xz -C $TEMP_DIR sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box >/dev/null 2>&1
     [ -s $TEMP_DIR/sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box ] && mv $TEMP_DIR/sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box $TEMP_DIR
@@ -867,12 +867,12 @@ sing-box_variables() {
   if [[ "$SERVER_IP" =~ : ]]; then
     STRATEGY=prefer_ipv6
   else
-    STRATEGY=prefer_ipv4
+    STRATEGY=ipv4_only
   fi
 
   # 检测是否解锁 chatGPT
   CHATGPT_OUT=warp-ep;
-  [ "$(check_chatgpt ${STRATEGY: -1})" = 'unlock' ] && CHATGPT_OUT=direct
+  [ "$(check_chatgpt $(grep -oE '[46]' <<< "$STRATEGY"))" = 'unlock' ] && CHATGPT_OUT=direct
 
   # 如选择有 c. hysteria2 时，选择是否使用端口跳跃
   [[ "${INSTALL_PROTOCOLS[@]}" =~ 'c' ]] && input_hopping_port