LerinaOwO commited on
Commit
f72b0fb
·
verified ·
1 Parent(s): d3d49b5

Update start.sh

Browse files
Files changed (1) hide show
  1. start.sh +25 -7
start.sh CHANGED
@@ -5,9 +5,6 @@ export PORT="${PORT:-7860}"
5
  export STEALTH_PORT="${STEALTH_PORT:-3011}"
6
  export ENABLE_STEALTH="${ENABLE_STEALTH:-false}"
7
  export PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/ms-playwright}"
8
-
9
- # 整个应用栈重启间隔(秒)
10
- # 例如 3000 = 50 分钟
11
  export FULL_APP_RESTART_INTERVAL="${FULL_APP_RESTART_INTERVAL:-3000}"
12
 
13
  echo "[start] PORT=$PORT"
@@ -33,16 +30,33 @@ while true; do
33
 
34
  unset STEALTH_PID
35
  unset MAIN_PID
 
36
 
37
  if [ "$ENABLE_STEALTH" = "true" ]; then
38
  export STEALTH_PROXY="${STEALTH_PROXY:-http://127.0.0.1:$STEALTH_PORT}"
39
  echo "[start] starting stealth-proxy at $STEALTH_PROXY"
40
- node /app/stealth-proxy/index.js &
 
41
  STEALTH_PID=$!
42
- sleep 5
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
43
  fi
44
 
45
- echo "[start] starting main service..."
46
  node /app/dist/index.js &
47
  MAIN_PID=$!
48
 
@@ -68,7 +82,11 @@ while true; do
68
  MAIN_EXIT=$?
69
  set -e
70
 
71
- kill "$TIMER_PID" 2>/dev/null || true
 
 
 
 
72
 
73
  if [ -n "${STEALTH_PID:-}" ]; then
74
  kill "$STEALTH_PID" 2>/dev/null || true
 
5
  export STEALTH_PORT="${STEALTH_PORT:-3011}"
6
  export ENABLE_STEALTH="${ENABLE_STEALTH:-false}"
7
  export PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/ms-playwright}"
 
 
 
8
  export FULL_APP_RESTART_INTERVAL="${FULL_APP_RESTART_INTERVAL:-3000}"
9
 
10
  echo "[start] PORT=$PORT"
 
30
 
31
  unset STEALTH_PID
32
  unset MAIN_PID
33
+ unset TIMER_PID
34
 
35
  if [ "$ENABLE_STEALTH" = "true" ]; then
36
  export STEALTH_PROXY="${STEALTH_PROXY:-http://127.0.0.1:$STEALTH_PORT}"
37
  echo "[start] starting stealth-proxy at $STEALTH_PROXY"
38
+
39
+ PORT="$STEALTH_PORT" node /app/stealth-proxy/index.js &
40
  STEALTH_PID=$!
41
+
42
+ echo "[start] waiting for stealth-proxy to be ready..."
43
+ READY=false
44
+ for i in $(seq 1 30); do
45
+ if wget -qO- "http://127.0.0.1:$STEALTH_PORT/health" 2>/dev/null | grep -q '"ok"\|"restarting"\|"initializing"'; then
46
+ READY=true
47
+ break
48
+ fi
49
+ sleep 2
50
+ done
51
+
52
+ if [ "$READY" = "true" ]; then
53
+ echo "[start] stealth-proxy responded on port $STEALTH_PORT"
54
+ else
55
+ echo "[start] warning: stealth-proxy did not become ready in time"
56
+ fi
57
  fi
58
 
59
+ echo "[start] starting main service on port $PORT..."
60
  node /app/dist/index.js &
61
  MAIN_PID=$!
62
 
 
82
  MAIN_EXIT=$?
83
  set -e
84
 
85
+ echo "[start] main service exited with code $MAIN_EXIT"
86
+
87
+ if [ -n "${TIMER_PID:-}" ]; then
88
+ kill "$TIMER_PID" 2>/dev/null || true
89
+ fi
90
 
91
  if [ -n "${STEALTH_PID:-}" ]; then
92
  kill "$STEALTH_PID" 2>/dev/null || true