From 4615342ef823de99f6c7eff1a15579491e4ff209 Mon Sep 17 00:00:00 2001
From: timqiu <9145422+cocoonwind@user.noreply.gitee.com>
Date: Tue, 25 Mar 2025 14:08:56 +0800
Subject: [PATCH 1/3] Update for fix VITE Chat env settings for online/local
 service

---
 devbox/cli/devbox | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/devbox/cli/devbox b/devbox/cli/devbox
index 39e5821..abb8013 100755
--- a/devbox/cli/devbox
+++ b/devbox/cli/devbox
@@ -798,6 +798,10 @@ if true ; then
   # 4️⃣ Install dependencies
   pnpm store prune
 
+  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/freeleaps/.env.development
+
+  sleep 20
+
   # 4️⃣ Install dependencies (ensuring lockfile updates)
   pnpm install --no-frozen-lockfile \\
                 --shamefully-hoist \\
@@ -808,6 +812,11 @@ if true ; then
   pnpm run build
 
 
+  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/
+
+  sleep 20
+
+
   # 5️⃣ Check git status
   echo 
   echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Checking git status..."
@@ -1294,10 +1303,28 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
       fi
   fi
 
+  # 
+  if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
+    sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+  else
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
+    sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    
+  fi
+
+
   # Start the frontend service
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Start frontend service..."
   nohup pnpm run dev > /home/devbox/logs/frontend.logs 2>&1 &
 
+  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Frontend service started. Logs: /home/devbox/logs/frontend.logs"
+  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/
+
+  echo 
+
   # Check git status
   echo 
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Checking git status..."

From d20d5d2da1f97fc164d621f11e8abcb1d24fd467 Mon Sep 17 00:00:00 2001
From: timqiu <9145422+cocoonwind@user.noreply.gitee.com>
Date: Tue, 25 Mar 2025 20:34:30 +0800
Subject: [PATCH 2/3] Update for frontend start setting for VITE chart config

---
 devbox/cli/devbox | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/devbox/cli/devbox b/devbox/cli/devbox
index abb8013..0d06465 100755
--- a/devbox/cli/devbox
+++ b/devbox/cli/devbox
@@ -722,6 +722,7 @@ EOFinner
     echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Update VITE_PROXY_WEBSOCKET_CHAT_URL and VITE_PROXY_API_CHAT_URL in frontend/.env.development"    
     sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
     sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development    
+    sed -i 's#http://freeleaps-chat:8012#https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/freeleaps/nginx_docker.conf
 
     echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Online component dev environment variables set."
 fi
@@ -1217,17 +1218,11 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
     echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
     sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
     sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
-    
+    sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=http://localhost:8012#VITE_PROXY_WEBSOCKET_CHAT_URL=https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i 's#VITE_PROXY_API_CHAT_URL=http://localhost:8012#VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i 's#http://freeleaps-chat:8012#https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/freeleaps/nginx_docker.conf
   fi
 
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Check frontend environment variables...from /home/devbox/freeleaps/frontend/freeleaps/.env.development"
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') \$(tail -n 30 /home/devbox/freeleaps/frontend/freeleaps/.env.development)"
-
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Starting frontend compilation and startup..."
-
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Checking frontend dependencies..."
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Time difference: \$time_diff seconds, lock_time: \$lock_time, modules_time: \$modules_time"
-
   if [[ ! -d "node_modules" || "package.json" -nt "node_modules" ||  \$time_diff -gt \$threshold ]]; then
       echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Installing/Updating frontend dependencies..."
 
@@ -1304,6 +1299,7 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
   fi
 
   # 
+  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') USE_LOCAL_COMPONENT_VAL: \$USE_LOCAL_COMPONENT_VAL"
   if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
     echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
     sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
@@ -1311,28 +1307,17 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
   else
     echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
     sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
-    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
-    
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development 
+    sed -i 's#http://freeleaps-chat:8012#https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/nginx_docker.conf
   fi
 
+  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Starting frontend compilation and startup..."
 
   # Start the frontend service
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Start frontend service..."
   nohup pnpm run dev > /home/devbox/logs/frontend.logs 2>&1 &
 
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Frontend service started. Logs: /home/devbox/logs/frontend.logs"
-  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/
-
-  echo 
-
-  # Check git status
-  echo 
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Checking git status..."
-  echo
-  git status -s
-  echo
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Git status check completed."
-  echo
 
   # Check the health of the frontend service: poll to detect HTTP status
   MAX_ATTEMPTS=30
@@ -1393,6 +1378,18 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
     exit 1
   fi
 
+  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') USE_LOCAL_COMPONENT_VAL: \$USE_LOCAL_COMPONENT_VAL"
+  if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
+    sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+  else
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
+    sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development 
+    sed -i 's#http://freeleaps-chat:8012#https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/nginx_docker.conf
+  fi
+
   echo
   echo "[FRONTEND]  \$(date '+%Y-%m-%d %H:%M:%S') Frontend compilation and startup completed."
   echo

From 145d4f16cebb14650eaeb679cae4834dd1010847 Mon Sep 17 00:00:00 2001
From: timqiu <9145422+cocoonwind@user.noreply.gitee.com>
Date: Wed, 26 Mar 2025 06:19:32 +0800
Subject: [PATCH 3/3] Update

---
 devbox/cli/devbox | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/devbox/cli/devbox b/devbox/cli/devbox
index 0d06465..3d16b18 100755
--- a/devbox/cli/devbox
+++ b/devbox/cli/devbox
@@ -799,10 +799,6 @@ if true ; then
   # 4️⃣ Install dependencies
   pnpm store prune
 
-  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/freeleaps/.env.development
-
-  sleep 20
-
   # 4️⃣ Install dependencies (ensuring lockfile updates)
   pnpm install --no-frozen-lockfile \\
                 --shamefully-hoist \\
@@ -813,16 +809,12 @@ if true ; then
   pnpm run build
 
 
-  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/
-
-  sleep 20
-
-
   # 5️⃣ Check git status
   echo 
   echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Checking git status..."
   echo 
 
+  pushd /home/devbox/freeleaps > /dev/null
   git config --global --add safe.directory /home/devbox/freeleaps
   git status -s
 
@@ -1102,7 +1094,7 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
     else
       echo "[BACKEND] \$(date '+%Y-%m-%d %H:%M:%S') Waiting for backend service... Attempt \$((ATTEMPT+1)) with HTTP \$HTTP_CODE"
       ATTEMPT=\$((ATTEMPT+1))
-      sleep 5
+      sleep 10
     fi
   done
   if [ \$ATTEMPT -eq \$MAX_ATTEMPTS ]; then
@@ -1212,8 +1204,6 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') USE_LOCAL_COMPONENT_VAL: \$USE_LOCAL_COMPONENT_VAL"
   if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
     echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
-    sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
-    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
   else
     echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
     sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
@@ -1408,6 +1398,21 @@ reset_freeleaps_repo() {
   git reset --hard HEAD
   popd > /dev/null
   echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') FreeLeaps repository reset completed."
+
+    USE_LOCAL_COMPONENT_VAL="false"
+  if [ -f "\$USE_LOCAL_COMPONENT_FLAG" ]; then
+    # Read the value from the file
+    USE_LOCAL_COMPONENT_VAL=\$(cat "\$USE_LOCAL_COMPONENT_FLAG")
+  fi
+if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
+  else
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
+    sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=.*#VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i 's#VITE_PROXY_API_CHAT_URL=http://localhost:8012#VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i 's#http://freeleaps-chat:8012#https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/nginx_docker.conf
+  fi
+
 EOF
 }