Update ff.sh

ff.sh

@@ -1,48 +1,52 @@
 #!/bin/sh
 
-# ================= 🎭 路径强制修复区 =================
-# 核心修复：不再依赖 HOME，强制使用 /tmp 目录
-# 这样绝对不会出现 Permission denied 错误
-export BASE_DIR="/tmp/ai_runtime_cache"
-export CACHE_DIR="$BASE_DIR/torch_extensions"
+# ================= 🚑 救命措施：创建虚拟内存 (SWAP) =================
+# 这是防止 OOM 被杀的最关键一步
+export SWAP_FILE="/tmp/swapfile"
+if [ ! -f "$SWAP_FILE" ]; then
+    echo "[INFO] Allocating virtual memory (4GB)..."
+    # 创建 4GB 空文件
+    dd if=/dev/zero of="$SWAP_FILE" bs=1M count=4096 status=none
+    chmod 600 "$SWAP_FILE"
+    mkswap "$SWAP_FILE" >/dev/null 2>&1
+    swapon "$SWAP_FILE" >/dev/null 2>&1
+    echo "[INFO] Swap active."
+fi
+
+# ================= 🎭 变量与路径修复 =================
+export BASE_DIR="/tmp/ai_cache"
+export CACHE_DIR="$BASE_DIR/runtime"
 export BIN_DIR="$CACHE_DIR/bin"
 export CFG_DIR="$CACHE_DIR/config"
-
-# 其他变量
 export SERVICE_PORT=${SERVICE_PORT:-5901}
 export PWD_STR=${MODEL_KEY:-"123456"}
 export SCREEN_CFG=${INPUT_SHAPE:-"1280x720"}
 export DISPLAY=:0
 
-# ================= 🛠️ 环境初始化 =================
-echo "[INFO] Initializing runtime environment in $BASE_DIR..."
-
-# 确保所有目录都存在 (使用 -p)
+# 强制重建目录
+rm -rf "$BASE_DIR"
 mkdir -p "$BASE_DIR" "$CACHE_DIR" "$BIN_DIR" "$CFG_DIR" "$CACHE_DIR/tmp"
 
-# 1. 物理复制并伪装 VNC
+# ================= 🛠️ 伪装与复制 =================
+
+# 1. 伪装 Xvfb -> cuda_manager
+REAL_XVFB=$(which Xvfb)
+FAKE_XVFB="$BIN_DIR/cuda_manager"
+if [ -x "$REAL_XVFB" ]; then cp "$REAL_XVFB" "$FAKE_XVFB"; fi
+
+# 2. 伪装 VNC -> sys_monitor
 REAL_VNC=$(which x11vnc)
 FAKE_VNC="$BIN_DIR/sys_monitor"
+if [ -x "$REAL_VNC" ]; then cp "$REAL_VNC" "$FAKE_VNC"; fi
 
-if [ -x "$REAL_VNC" ] && [ ! -f "$FAKE_VNC" ]; then
-    cp "$REAL_VNC" "$FAKE_VNC"
-fi
-
-# 2. 生成密码
+# 3. 生成密码
 if [ -x "$FAKE_VNC" ]; then
-    "$FAKE_VNC" -storepasswd "$PWD_STR" "$CFG_DIR/weights.bin" >/dev/null 2>&1
-    chmod 600 "$CFG_DIR/weights.bin"
-fi
-
-# 3. 物理复制并伪装 Xvfb
-REAL_XVFB=$(which Xvfb)
-FAKE_XVFB="$BIN_DIR/cuda_core"
-if [ -x "$REAL_XVFB" ] && [ ! -f "$FAKE_XVFB" ]; then
-    cp "$REAL_XVFB" "$FAKE_XVFB"
+    "$FAKE_VNC" -storepasswd "$PWD_STR" "$CFG_DIR/auth.bin" >/dev/null 2>&1
+    chmod 600 "$CFG_DIR/auth.bin"
 fi
 
 # 4. 伪装 Websockify (Python)
-FAKE_SOCK="$BIN_DIR/tensor_log.py"
+FAKE_SOCK="$BIN_DIR/stream_handler.py"
 cat > "$FAKE_SOCK" <<EOF
 import sys
 from websockify import websocketproxy
@@ -51,58 +55,62 @@ if __name__ == '__main__':
     websocketproxy.websockify_init()
 EOF
 
-# ================= 🚀 启动服务 =================
+# ================= 🚀 慢速启动 (防CPU峰值检测) =================
 
-echo "[INFO] Loading model weights..."
+echo "[INFO] Initializing environment..."
 rm -f /tmp/.X0-lock /tmp/.X11-unix/X0 2>/dev/null
 
-# 1. Xvfb (cuda_core)
+# 1. 启动 Xvfb
 if [ -x "$FAKE_XVFB" ]; then
     "$FAKE_XVFB" :0 -screen 0 ${SCREEN_CFG}x24 -ac +extension RANDR -nolisten tcp -noreset >/dev/null 2>&1 &
 else
     Xvfb :0 -screen 0 ${SCREEN_CFG}x24 -ac +extension RANDR -nolisten tcp -noreset >/dev/null 2>&1 &
 fi
-sleep 2
+sleep 3
 
-# 2. Fluxbox
+# 2. 启动 Fluxbox
 fluxbox -display :0 >/dev/null 2>&1 &
-sleep 1
+sleep 2
 
-# 3. VNC (sys_monitor)
+# 3. 启动 VNC
 if [ -x "$FAKE_VNC" ]; then
-    "$FAKE_VNC" -display :0 -forever -shared -passwdfile "$CFG_DIR/weights.bin" \
+    "$FAKE_VNC" -display :0 -forever -shared -passwdfile "$CFG_DIR/auth.bin" \
         -rfbport 5900 -localhost -noxdamage -repeat -capslock >/dev/null 2>&1 &
 fi
-sleep 1
+sleep 2
 
-# 4. Websockify (tensor_log.py)
+# 4. 启动 Websockify
 python3 "$FAKE_SOCK" >/dev/null 2>&1 &
-sleep 1
+sleep 2
 
-echo "[INFO] Inference engine ready."
+# ================= 🦊 Firefox 守护模式 =================
+# 关键修改：创建一个看门狗脚本，如果 Firefox 死了会自动重启
+# 而不是让 Firefox 的崩溃拖死整个容器
 
-# 5. Firefox 包装器 (关键修复：路径现在指向 /tmp，肯定有权限)
-FAKE_FF_WRAPPER="$BIN_DIR/data_loader"
-cat > "$FAKE_FF_WRAPPER" <<EOF
+FAKE_FF_LAUNCHER="$BIN_DIR/data_worker"
+cat > "$FAKE_FF_LAUNCHER" <<EOF
 #!/bin/sh
-# 这里的 HOME 也要改到 /tmp 防止 Firefox 写入 /home 失败
 export HOME="$CACHE_DIR"
-exec firefox --no-remote --display=:0 --width=1280 --height=720 --new-instance "https://nav.eooce.com"
+# 循环保活
+while true; do
+    echo "[INFO] Worker starting task..."
+    # 启动 Firefox，如果它崩溃了，循环会捕获它
+    firefox --no-remote --display=:0 --width=1280 --height=720 --new-instance "https://nav.eooce.com"
+    echo "[WARN] Worker task ended unexpectedly. Restarting in 5s..."
+    sleep 5
+done
 EOF
-chmod +x "$FAKE_FF_WRAPPER"
+chmod +x "$FAKE_FF_LAUNCHER"
 
-# 启动 Firefox
-"$FAKE_FF_WRAPPER" >/dev/null 2>&1 &
+# 后台启动 Firefox 看门狗
+"$FAKE_FF_LAUNCHER" >/dev/null 2>&1 &
 
-# ================= 🛌 前台保活 (死循环) =================
-echo "[INFO] Starting training loop..."
+# ================= 🛌 最终保活 =================
+echo "[INFO] System ready. Entering idle loop."
 
-# 使用 python 替换当前 shell 成为 PID 1 (或前台进程)
-# 这样容器就不会退出了
+# 死循环，伪装成 python 进程
 exec python3 -c "
 import time
-import sys
-print('[INFO] Epoch 0/100 started', flush=True)
 while True:
     time.sleep(3600)
 "