mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-11 05:20:44 +08:00
重构主控编排与运行时预热链路，统一工作区提示词/专家调度协议并补齐 wiki 记忆注入与写回闭环。
同时收敛启动与运维脚本默认行为（含 wiki worker）、更新 Admin 可观测性与相关测试，降低首轮时延并提高运行稳定性。 Made-with: Cursor
This commit is contained in:
parent
4a23b715a2
commit
dbbe3add6a
14438 changed files with 2693620 additions and 2546 deletions
209
openclaw/scripts/sandbox-browser-entrypoint.sh
Normal file
209
openclaw/scripts/sandbox-browser-entrypoint.sh
Normal file
|
|
@ -0,0 +1,209 @@
|
|||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
export DBUS_SESSION_BUS_ADDRESS=/dev/null
|
||||
|
||||
export DISPLAY=:1
|
||||
export HOME=/tmp/openclaw-home
|
||||
export XDG_CONFIG_HOME="${HOME}/.config"
|
||||
export XDG_CACHE_HOME="${HOME}/.cache"
|
||||
|
||||
CDP_PORT="${OPENCLAW_BROWSER_CDP_PORT:-9222}"
|
||||
CDP_SOURCE_RANGE="${OPENCLAW_BROWSER_CDP_SOURCE_RANGE:-}"
|
||||
VNC_PORT="${OPENCLAW_BROWSER_VNC_PORT:-5900}"
|
||||
NOVNC_PORT="${OPENCLAW_BROWSER_NOVNC_PORT:-6080}"
|
||||
ENABLE_NOVNC="${OPENCLAW_BROWSER_ENABLE_NOVNC:-1}"
|
||||
HEADLESS="${OPENCLAW_BROWSER_HEADLESS:-0}"
|
||||
ALLOW_NO_SANDBOX="${OPENCLAW_BROWSER_NO_SANDBOX:-0}"
|
||||
NOVNC_PASSWORD="${OPENCLAW_BROWSER_NOVNC_PASSWORD:-}"
|
||||
|
||||
DISABLE_GRAPHICS_FLAGS="${OPENCLAW_BROWSER_DISABLE_GRAPHICS_FLAGS:-1}"
|
||||
DISABLE_EXTENSIONS="${OPENCLAW_BROWSER_DISABLE_EXTENSIONS:-1}"
|
||||
RENDERER_PROCESS_LIMIT="${OPENCLAW_BROWSER_RENDERER_PROCESS_LIMIT:-2}"
|
||||
AUTO_START_TIMEOUT_MS="${OPENCLAW_BROWSER_AUTO_START_TIMEOUT_MS:-12000}"
|
||||
|
||||
validate_uint() {
|
||||
local name="$1"
|
||||
local value="$2"
|
||||
local min="${3:-0}"
|
||||
local max="${4:-4294967295}"
|
||||
|
||||
if ! [[ "$value" =~ ^[0-9]+$ ]]; then
|
||||
echo "[sandbox] ERROR: $name must be an integer, got: ${value}" >&2
|
||||
exit 1
|
||||
fi
|
||||
if (( value < min || value > max )); then
|
||||
echo "[sandbox] ERROR: $name out of range (${min}..${max}), got: ${value}" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
validate_uint "CDP_PORT" "$CDP_PORT" 1 65535
|
||||
validate_uint "VNC_PORT" "$VNC_PORT" 1 65535
|
||||
validate_uint "NOVNC_PORT" "$NOVNC_PORT" 1 65535
|
||||
validate_uint "AUTO_START_TIMEOUT_MS" "$AUTO_START_TIMEOUT_MS" 1 2147483647
|
||||
if [[ -n "$RENDERER_PROCESS_LIMIT" ]]; then
|
||||
validate_uint "RENDERER_PROCESS_LIMIT" "$RENDERER_PROCESS_LIMIT" 0 2147483647
|
||||
fi
|
||||
|
||||
cleanup() {
|
||||
local code="${1:-1}"
|
||||
trap - EXIT INT TERM
|
||||
|
||||
local pids=()
|
||||
local pid
|
||||
|
||||
for pid in "${WEBSOCKIFY_PID:-}" "${X11VNC_PID:-}" "${SOCAT_PID:-}" "${CHROME_PID:-}" "${XVFB_PID:-}"; do
|
||||
if [[ -n "${pid:-}" ]]; then
|
||||
pids+=("$pid")
|
||||
fi
|
||||
done
|
||||
|
||||
if ((${#pids[@]} > 0)); then
|
||||
kill -TERM "${pids[@]}" 2>/dev/null || true
|
||||
|
||||
for _ in {1..10}; do
|
||||
local alive=0
|
||||
for pid in "${pids[@]}"; do
|
||||
if kill -0 "$pid" 2>/dev/null; then
|
||||
alive=1
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [[ "$alive" == "0" ]]; then
|
||||
break
|
||||
fi
|
||||
sleep 0.2
|
||||
done
|
||||
|
||||
kill -KILL "${pids[@]}" 2>/dev/null || true
|
||||
wait 2>/dev/null || true
|
||||
fi
|
||||
|
||||
exit "$code"
|
||||
}
|
||||
|
||||
trap 'cleanup "$?"' EXIT
|
||||
trap 'cleanup 130' INT
|
||||
trap 'cleanup 143' TERM
|
||||
|
||||
mkdir -p "${HOME}" "${HOME}/.chrome" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}"
|
||||
|
||||
Xvfb :1 -screen 0 1280x800x24 -ac -nolisten tcp &
|
||||
XVFB_PID=$!
|
||||
echo "[sandbox] Xvfb started (PID: ${XVFB_PID})"
|
||||
|
||||
if [[ "${CDP_PORT}" -ge 65535 ]]; then
|
||||
CHROME_CDP_PORT="$((CDP_PORT - 1))"
|
||||
else
|
||||
CHROME_CDP_PORT="$((CDP_PORT + 1))"
|
||||
fi
|
||||
|
||||
CHROME_ARGS=(
|
||||
"--remote-debugging-address=127.0.0.1"
|
||||
"--remote-debugging-port=${CHROME_CDP_PORT}"
|
||||
"--user-data-dir=${HOME}/.chrome"
|
||||
"--no-first-run"
|
||||
"--no-default-browser-check"
|
||||
"--disable-dev-shm-usage"
|
||||
"--disable-background-networking"
|
||||
"--disable-breakpad"
|
||||
"--disable-crash-reporter"
|
||||
"--no-zygote"
|
||||
"--metrics-recording-only"
|
||||
"--password-store=basic"
|
||||
"--use-mock-keychain"
|
||||
)
|
||||
|
||||
if [[ "${HEADLESS}" == "1" ]]; then
|
||||
CHROME_ARGS+=("--headless=new")
|
||||
fi
|
||||
|
||||
if [[ "${ALLOW_NO_SANDBOX}" == "1" ]]; then
|
||||
CHROME_ARGS+=("--no-sandbox" "--disable-setuid-sandbox")
|
||||
fi
|
||||
|
||||
DISABLE_GRAPHICS_FLAGS_LOWER="${DISABLE_GRAPHICS_FLAGS,,}"
|
||||
if [[ "${DISABLE_GRAPHICS_FLAGS_LOWER}" =~ ^(1|true|yes|on)$ ]]; then
|
||||
CHROME_ARGS+=(
|
||||
"--disable-3d-apis"
|
||||
"--disable-gpu"
|
||||
"--disable-software-rasterizer"
|
||||
)
|
||||
fi
|
||||
|
||||
DISABLE_EXTENSIONS_LOWER="${DISABLE_EXTENSIONS,,}"
|
||||
if [[ "${DISABLE_EXTENSIONS_LOWER}" =~ ^(1|true|yes|on)$ ]]; then
|
||||
CHROME_ARGS+=("--disable-extensions")
|
||||
fi
|
||||
|
||||
if [[ "${RENDERER_PROCESS_LIMIT}" =~ ^[0-9]+$ && "${RENDERER_PROCESS_LIMIT}" -gt 0 ]]; then
|
||||
CHROME_ARGS+=("--renderer-process-limit=${RENDERER_PROCESS_LIMIT}")
|
||||
fi
|
||||
|
||||
echo "[sandbox] Starting Chromium..."
|
||||
chromium "${CHROME_ARGS[@]}" about:blank &
|
||||
CHROME_PID=$!
|
||||
echo "[sandbox] Chromium started (PID: ${CHROME_PID})"
|
||||
|
||||
start_ms=$(date +%s%3N)
|
||||
deadline_ms=$(( start_ms + AUTO_START_TIMEOUT_MS ))
|
||||
CDP_READY=0
|
||||
probe_url="http://127.0.0.1:${CHROME_CDP_PORT}/json/version"
|
||||
|
||||
echo "[sandbox] Waiting up to ${AUTO_START_TIMEOUT_MS}ms for CDP on port ${CHROME_CDP_PORT}..."
|
||||
|
||||
while (( $(date +%s%3N) < deadline_ms )); do
|
||||
if ! kill -0 "${CHROME_PID}" 2>/dev/null; then
|
||||
echo "[sandbox] ERROR: Chromium exited before CDP became ready."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if curl -fsS --max-time 0.5 "${probe_url}" >/dev/null; then
|
||||
CDP_READY=1
|
||||
break
|
||||
fi
|
||||
|
||||
sleep 0.2
|
||||
done
|
||||
|
||||
if [[ "${CDP_READY}" == "0" ]]; then
|
||||
echo "[sandbox] ERROR: CDP failed to start within ${AUTO_START_TIMEOUT_MS}ms."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "[sandbox] CDP ready. Starting socat..."
|
||||
|
||||
if [[ -z "${CDP_SOURCE_RANGE}" ]]; then
|
||||
echo "[sandbox-browser] WARNING: CDP_SOURCE_RANGE unset; socat CDP relay will not start." >&2
|
||||
echo "[sandbox-browser] Set OPENCLAW_BROWSER_CDP_SOURCE_RANGE to an explicit CIDR to enable CDP access." >&2
|
||||
else
|
||||
SOCAT_LISTEN_ADDR="TCP-LISTEN:${CDP_PORT},fork,reuseaddr,bind=0.0.0.0"
|
||||
SOCAT_LISTEN_ADDR="${SOCAT_LISTEN_ADDR},range=${CDP_SOURCE_RANGE}"
|
||||
socat "${SOCAT_LISTEN_ADDR}" "TCP:127.0.0.1:${CHROME_CDP_PORT}" &
|
||||
SOCAT_PID=$!
|
||||
echo "[sandbox] socat started (PID: ${SOCAT_PID})"
|
||||
fi
|
||||
|
||||
if [[ "${ENABLE_NOVNC}" == "1" && "${HEADLESS}" != "1" ]]; then
|
||||
if [[ -z "${NOVNC_PASSWORD}" ]]; then
|
||||
NOVNC_PASSWORD="$(< /proc/sys/kernel/random/uuid)"
|
||||
NOVNC_PASSWORD="${NOVNC_PASSWORD//-/}"
|
||||
NOVNC_PASSWORD="${NOVNC_PASSWORD:0:8}"
|
||||
fi
|
||||
|
||||
mkdir -p "${HOME}/.vnc"
|
||||
x11vnc -storepasswd "${NOVNC_PASSWORD}" "${HOME}/.vnc/passwd" >/dev/null
|
||||
chmod 600 "${HOME}/.vnc/passwd"
|
||||
|
||||
x11vnc -display :1 -rfbport "${VNC_PORT}" -shared -forever -rfbauth "${HOME}/.vnc/passwd" -localhost &
|
||||
X11VNC_PID=$!
|
||||
echo "[sandbox] x11vnc started (PID: ${X11VNC_PID})"
|
||||
|
||||
websockify --web /usr/share/novnc/ "${NOVNC_PORT}" "localhost:${VNC_PORT}" &
|
||||
WEBSOCKIFY_PID=$!
|
||||
echo "[sandbox] websockify started (PID: ${WEBSOCKIFY_PID})"
|
||||
fi
|
||||
|
||||
echo "[sandbox] Container running. Monitoring all sub-processes..."
|
||||
wait -n
|
||||
Loading…
Add table
Add a link
Reference in a new issue