feat: 使用 uv 锁定主程序依赖并强化插件恢复边界 (#6364)

scripts/dev/simulate_docker_package_env.sh

@@ -5,22 +5,22 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 TMP_DIR="$(mktemp -d)"
 trap 'rm -rf "${TMP_DIR}"' EXIT
 
-mkdir -p "${TMP_DIR}/venv/bin" "${TMP_DIR}/config"
+mkdir -p "${TMP_DIR}/bin" "${TMP_DIR}/venv/bin" "${TMP_DIR}/config"
 
-cat > "${TMP_DIR}/venv/bin/pip" <<'SH'
+cat > "${TMP_DIR}/bin/uv" <<'SH'
 #!/usr/bin/env bash
-printf 'argv=%s\n' "$*" >> "${MP_FAKE_PIP_LOG}"
-printf 'HTTP_PROXY=%s\n' "${HTTP_PROXY:-}" >> "${MP_FAKE_PIP_LOG}"
-printf 'HTTPS_PROXY=%s\n' "${HTTPS_PROXY:-}" >> "${MP_FAKE_PIP_LOG}"
-printf 'PACKAGE_CACHE_ROOT=%s\n' "${PACKAGE_CACHE_ROOT:-}" >> "${MP_FAKE_PIP_LOG}"
-printf 'PIP_CACHE_DIR=%s\n' "${PIP_CACHE_DIR:-}" >> "${MP_FAKE_PIP_LOG}"
-printf 'UV_CACHE_DIR=%s\n' "${UV_CACHE_DIR:-}" >> "${MP_FAKE_PIP_LOG}"
-if [ "${MP_FAKE_PIP_FAIL:-}" = "1" ]; then
+printf 'argv=%s\n' "$*" >> "${MP_FAKE_UV_LOG}"
+printf 'HTTP_PROXY=%s\n' "${HTTP_PROXY:-}" >> "${MP_FAKE_UV_LOG}"
+printf 'HTTPS_PROXY=%s\n' "${HTTPS_PROXY:-}" >> "${MP_FAKE_UV_LOG}"
+printf 'PACKAGE_CACHE_ROOT=%s\n' "${PACKAGE_CACHE_ROOT:-}" >> "${MP_FAKE_UV_LOG}"
+printf 'UV_CACHE_DIR=%s\n' "${UV_CACHE_DIR:-}" >> "${MP_FAKE_UV_LOG}"
+printf 'UV_PROJECT_ENVIRONMENT=%s\n' "${UV_PROJECT_ENVIRONMENT:-}" >> "${MP_FAKE_UV_LOG}"
+if [ "${MP_FAKE_UV_FAIL:-}" = "1" ]; then
   exit 1
 fi
 exit 0
 SH
-chmod +x "${TMP_DIR}/venv/bin/pip"
+chmod +x "${TMP_DIR}/bin/uv"
 
 assert_contains() {
   local needle="$1"
@@ -42,52 +42,50 @@ assert_not_contains() {
   fi
 }
 
-UPDATE_FUNCS="${TMP_DIR}/update-functions.sh"
-awk '
-  BEGIN {capture=1}
-  /^if \[\[ "\$\{MOVIEPILOT_AUTO_UPDATE\}"/ {capture=0}
-  capture {print}
-' "${ROOT}/docker/update.sh" > "${UPDATE_FUNCS}"
+# macOS 默认不提供 GNU timeout；模拟器只需保留被执行命令的参数和环境。
+timeout() {
+  if [[ "${1:-}" == --kill-after=* ]]; then
+    shift
+  fi
+  shift
+  "$@"
+}
 
-MP_FAKE_PIP_LOG="${TMP_DIR}/update.log"
-export MP_FAKE_PIP_LOG
+MP_FAKE_UV_LOG="${TMP_DIR}/update.log"
+export MP_FAKE_UV_LOG
+export UV_BIN="${TMP_DIR}/bin/uv"
 export VENV_PATH="${TMP_DIR}/venv"
 export CONFIG_DIR="${TMP_DIR}/config"
 export MOVIEPILOT_AUTO_UPDATE=false
 export PIP_PROXY="https://mirror.example/simple"
 export PROXY_HOST="http://proxy.example:7890"
-unset PACKAGE_CACHE_ROOT PIP_CACHE_DIR UV_CACHE_DIR HTTP_PROXY HTTPS_PROXY http_proxy https_proxy
-source "${UPDATE_FUNCS}" >/dev/null
+unset PACKAGE_CACHE_ROOT UV_CACHE_DIR HTTP_PROXY HTTPS_PROXY http_proxy https_proxy
+source "${ROOT}/docker/update.sh" >/dev/null
 
-: > "${MP_FAKE_PIP_LOG}"
-test_connectivity_pip 0
-assert_contains "argv=install -i https://mirror.example/simple pip-hello-world" "${MP_FAKE_PIP_LOG}"
-assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_PIP_LOG}"
-assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/config/.cache" "${MP_FAKE_PIP_LOG}"
-assert_contains "PIP_CACHE_DIR=${TMP_DIR}/config/.cache/pip" "${MP_FAKE_PIP_LOG}"
-assert_contains "UV_CACHE_DIR=${TMP_DIR}/config/.cache/uv" "${MP_FAKE_PIP_LOG}"
-if [[ "${PIP_OPTIONS}" != "-i ${PIP_PROXY}" ]]; then
-  echo "mirror branch must preserve index option: ${PIP_OPTIONS}" >&2
-  exit 1
-fi
-if [[ "${PIP_OPTIONS}" == *"--proxy"* ]]; then
-  echo "PIP_OPTIONS must not contain --proxy: ${PIP_OPTIONS}" >&2
+: > "${MP_FAKE_UV_LOG}"
+test_connectivity_package 0
+assert_contains "argv=pip install --target " "${MP_FAKE_UV_LOG}"
+assert_contains "--no-deps --default-index https://mirror.example/simple pip-hello-world" "${MP_FAKE_UV_LOG}"
+assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_UV_LOG}"
+assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/config/.cache" "${MP_FAKE_UV_LOG}"
+assert_contains "UV_CACHE_DIR=${TMP_DIR}/config/.cache/uv" "${MP_FAKE_UV_LOG}"
+if [[ "${UV_OPTIONS[*]}" != "--default-index ${PIP_PROXY}" ]]; then
+  echo "mirror branch must preserve uv index option: ${UV_OPTIONS[*]}" >&2
   exit 1
 fi
 if [[ -n "${HTTP_PROXY:-}" || -n "${HTTPS_PROXY:-}" || -n "${http_proxy:-}" || -n "${https_proxy:-}" ]]; then
-  echo "pip connectivity must not leak PROXY_HOST into parent proxy env" >&2
+  echo "package connectivity must not leak PROXY_HOST into parent proxy env" >&2
   env | grep -E '^(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=' >&2 || true
   exit 1
 fi
-assert_not_contains "user:pass" "${MP_FAKE_PIP_LOG}"
 
-: > "${MP_FAKE_PIP_LOG}"
+: > "${MP_FAKE_UV_LOG}"
 PIP_PROXY=""
-test_connectivity_pip 1
-assert_contains "argv=install pip-hello-world" "${MP_FAKE_PIP_LOG}"
-assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_PIP_LOG}"
-if [[ -n "${PIP_OPTIONS}" ]]; then
-  echo "proxy branch must keep PIP_OPTIONS empty: ${PIP_OPTIONS}" >&2
+test_connectivity_package 1
+assert_contains "argv=pip install --target " "${MP_FAKE_UV_LOG}"
+assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_UV_LOG}"
+if [[ ${#UV_OPTIONS[@]} -ne 0 ]]; then
+  echo "proxy branch must keep UV_OPTIONS empty: ${UV_OPTIONS[*]}" >&2
   exit 1
 fi
 if [[ -n "${HTTP_PROXY:-}" || -n "${HTTPS_PROXY:-}" || -n "${http_proxy:-}" || -n "${https_proxy:-}" ]]; then
@@ -96,66 +94,54 @@ if [[ -n "${HTTP_PROXY:-}" || -n "${HTTPS_PROXY:-}" || -n "${http_proxy:-}" || -
   exit 1
 fi
 
-MP_FAKE_PIP_LOG="${TMP_DIR}/update-explicit-standard-proxy.log"
-export MP_FAKE_PIP_LOG
+MP_FAKE_UV_LOG="${TMP_DIR}/update-explicit-standard-proxy.log"
+export MP_FAKE_UV_LOG
 (
   export VENV_PATH="${TMP_DIR}/venv"
   export CONFIG_DIR="${TMP_DIR}/config"
-  export MOVIEPILOT_AUTO_UPDATE=false
   export PIP_PROXY=""
   export PROXY_HOST="http://proxy.example:7890"
   export HTTP_PROXY="http://explicit.example:8080"
   export HTTPS_PROXY="http://explicit.example:8080"
   export http_proxy="http://explicit.example:8080"
   export https_proxy="http://explicit.example:8080"
-  source "${UPDATE_FUNCS}" >/dev/null
-  test_connectivity_pip 1
+  source "${ROOT}/docker/update.sh" >/dev/null
+  test_connectivity_package 1
   if [[ "${HTTP_PROXY}" != "http://explicit.example:8080" || "${HTTPS_PROXY}" != "http://explicit.example:8080" ]]; then
     echo "explicit standard proxy env must be preserved" >&2
-    env | grep -E '^(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=' >&2 || true
     exit 1
   fi
 )
-assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_PIP_LOG}"
+assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_UV_LOG}"
 
-MP_FAKE_PIP_LOG="${TMP_DIR}/update-explicit-cache.log"
-export MP_FAKE_PIP_LOG
+MP_FAKE_UV_LOG="${TMP_DIR}/update-explicit-cache.log"
+export MP_FAKE_UV_LOG
 (
   export VENV_PATH="${TMP_DIR}/venv"
   export CONFIG_DIR="${TMP_DIR}/config"
-  export MOVIEPILOT_AUTO_UPDATE=false
   export PACKAGE_CACHE_ROOT="${TMP_DIR}/update-custom-package-cache"
-  export PIP_CACHE_DIR="${TMP_DIR}/explicit-pip-cache"
   export UV_CACHE_DIR="${TMP_DIR}/explicit-uv-cache"
   export PIP_PROXY="https://mirror.example/simple"
   export PROXY_HOST="http://proxy.example:7890"
-  source "${UPDATE_FUNCS}" >/dev/null
-  test_connectivity_pip 0
+  source "${ROOT}/docker/update.sh" >/dev/null
+  test_connectivity_package 0
 )
+assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/update-custom-package-cache" "${MP_FAKE_UV_LOG}"
+assert_contains "UV_CACHE_DIR=${TMP_DIR}/explicit-uv-cache" "${MP_FAKE_UV_LOG}"
 
-assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/update-custom-package-cache" "${MP_FAKE_PIP_LOG}"
-assert_contains "PIP_CACHE_DIR=${TMP_DIR}/explicit-pip-cache" "${MP_FAKE_PIP_LOG}"
-assert_contains "UV_CACHE_DIR=${TMP_DIR}/explicit-uv-cache" "${MP_FAKE_PIP_LOG}"
-
-MP_FAKE_PIP_LOG="${TMP_DIR}/update-fallback-no-proxy.log"
-export MP_FAKE_PIP_LOG
+MP_FAKE_UV_LOG="${TMP_DIR}/update-fallback-no-proxy.log"
+export MP_FAKE_UV_LOG
 (
   export VENV_PATH="${TMP_DIR}/venv"
   export CONFIG_DIR="${TMP_DIR}/config"
-  export MOVIEPILOT_AUTO_UPDATE=false
   export PIP_PROXY="https://mirror.example/simple"
   export PROXY_HOST="http://proxy.example:7890"
-  unset PACKAGE_CACHE_ROOT PIP_CACHE_DIR UV_CACHE_DIR HTTP_PROXY HTTPS_PROXY http_proxy https_proxy
-  source "${UPDATE_FUNCS}" >/dev/null
-  MP_FAKE_PIP_FAIL=1 test_connectivity_pip 0 && exit 1
-  if [[ -n "${HTTPS_PROXY:-}" || -n "${https_proxy:-}" ]]; then
-    echo "mirror failure must not leak proxy env" >&2
-    env | grep -E '^(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=' >&2 || true
-    exit 1
-  fi
-  test_connectivity_pip 2
-  if [[ "${PIP_LOG}" != "不使用代理" ]]; then
-    echo "fallback branch must report direct mode: ${PIP_LOG}" >&2
+  unset PACKAGE_CACHE_ROOT UV_CACHE_DIR HTTP_PROXY HTTPS_PROXY http_proxy https_proxy
+  source "${ROOT}/docker/update.sh" >/dev/null
+  MP_FAKE_UV_FAIL=1 test_connectivity_package 0 && exit 1
+  test_connectivity_package 2
+  if [[ "${PACKAGE_LOG}" != "不使用代理" ]]; then
+    echo "fallback branch must report direct mode: ${PACKAGE_LOG}" >&2
     exit 1
   fi
 )
@@ -183,13 +169,13 @@ exit 0
 SH
 chmod +x "${TMP_DIR}/venv/bin/python3"
 
-MP_FAKE_PIP_LOG="${TMP_DIR}/entrypoint.log"
+MP_FAKE_UV_LOG="${TMP_DIR}/entrypoint.log"
 MP_FAKE_PYTHON_COUNT="${TMP_DIR}/python-count"
-export MP_FAKE_PIP_LOG MP_FAKE_PYTHON_COUNT
+export MP_FAKE_UV_LOG MP_FAKE_PYTHON_COUNT
 (
   export VENV_PATH="${TMP_DIR}/venv"
   export CONFIG_DIR="${TMP_DIR}/config"
-  unset PACKAGE_CACHE_ROOT PIP_CACHE_DIR UV_CACHE_DIR HTTP_PROXY HTTPS_PROXY http_proxy https_proxy
+  unset PACKAGE_CACHE_ROOT UV_CACHE_DIR HTTP_PROXY HTTPS_PROXY http_proxy https_proxy
   export PIP_PROXY=""
   export PROXY_HOST="http://proxy.example:7890"
   source "${ENTRYPOINT_FUNCS}"
@@ -197,25 +183,24 @@ export MP_FAKE_PIP_LOG MP_FAKE_PYTHON_COUNT
   ensure_backend_runtime_dependencies
   if [[ -n "${HTTP_PROXY:-}" || -n "${HTTPS_PROXY:-}" || -n "${http_proxy:-}" || -n "${https_proxy:-}" ]]; then
     echo "dependency recovery must not leak PROXY_HOST into parent proxy env" >&2
-    env | grep -E '^(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=' >&2 || true
     exit 1
   fi
 ) >/dev/null
 
-assert_contains "argv=install -r /app/requirements.txt" "${MP_FAKE_PIP_LOG}"
-assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_PIP_LOG}"
-assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/config/.cache" "${MP_FAKE_PIP_LOG}"
-assert_contains "PIP_CACHE_DIR=${TMP_DIR}/config/.cache/pip" "${MP_FAKE_PIP_LOG}"
-assert_contains "UV_CACHE_DIR=${TMP_DIR}/config/.cache/uv" "${MP_FAKE_PIP_LOG}"
-assert_not_contains "--proxy" "${MP_FAKE_PIP_LOG}"
+assert_contains "argv=sync --project /app --locked --no-dev --no-install-project --inexact" "${MP_FAKE_UV_LOG}"
+assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_UV_LOG}"
+assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/config/.cache" "${MP_FAKE_UV_LOG}"
+assert_contains "UV_CACHE_DIR=${TMP_DIR}/config/.cache/uv" "${MP_FAKE_UV_LOG}"
+assert_contains "UV_PROJECT_ENVIRONMENT=${TMP_DIR}/venv" "${MP_FAKE_UV_LOG}"
+assert_not_contains "requirements" "${MP_FAKE_UV_LOG}"
 
-MP_FAKE_PIP_LOG="${TMP_DIR}/entrypoint-explicit-standard-proxy.log"
+MP_FAKE_UV_LOG="${TMP_DIR}/entrypoint-explicit-standard-proxy.log"
 MP_FAKE_PYTHON_COUNT="${TMP_DIR}/python-count-explicit-standard-proxy"
-export MP_FAKE_PIP_LOG MP_FAKE_PYTHON_COUNT
+export MP_FAKE_UV_LOG MP_FAKE_PYTHON_COUNT
 (
   export VENV_PATH="${TMP_DIR}/venv"
   export CONFIG_DIR="${TMP_DIR}/config"
-  unset PACKAGE_CACHE_ROOT PIP_CACHE_DIR UV_CACHE_DIR
+  unset PACKAGE_CACHE_ROOT UV_CACHE_DIR
   export PIP_PROXY=""
   export PROXY_HOST="http://proxy.example:7890"
   export HTTP_PROXY="http://explicit.example:8080"
@@ -227,32 +212,28 @@ export MP_FAKE_PIP_LOG MP_FAKE_PYTHON_COUNT
   ensure_backend_runtime_dependencies
   if [[ "${HTTP_PROXY}" != "http://explicit.example:8080" || "${HTTPS_PROXY}" != "http://explicit.example:8080" ]]; then
     echo "dependency recovery must preserve explicit standard proxy env" >&2
-    env | grep -E '^(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=' >&2 || true
     exit 1
   fi
 ) >/dev/null
+assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_UV_LOG}"
 
-assert_contains "HTTPS_PROXY=http://proxy.example:7890" "${MP_FAKE_PIP_LOG}"
-
-MP_FAKE_PIP_LOG="${TMP_DIR}/entrypoint-app-env.log"
+MP_FAKE_UV_LOG="${TMP_DIR}/entrypoint-app-env.log"
 MP_FAKE_PYTHON_COUNT="${TMP_DIR}/python-count-app-env"
 cat > "${TMP_DIR}/config/app.env" <<EOF
 PACKAGE_CACHE_ROOT='${TMP_DIR}/app-env-custom-package-cache'
 PROXY_HOST='http://proxy.example:7890'
 EOF
-export MP_FAKE_PIP_LOG MP_FAKE_PYTHON_COUNT
+export MP_FAKE_UV_LOG MP_FAKE_PYTHON_COUNT
 (
   export VENV_PATH="${TMP_DIR}/venv"
   export CONFIG_DIR="${TMP_DIR}/config"
-  unset PACKAGE_CACHE_ROOT PIP_CACHE_DIR UV_CACHE_DIR PIP_PROXY PROXY_HOST
+  unset PACKAGE_CACHE_ROOT UV_CACHE_DIR PIP_PROXY PROXY_HOST
   source "${ENTRYPOINT_FUNCS}"
   load_config_from_app_env
   apply_package_cache_env
   ensure_backend_runtime_dependencies
 ) >/dev/null
-
-assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/app-env-custom-package-cache" "${MP_FAKE_PIP_LOG}"
-assert_contains "PIP_CACHE_DIR=${TMP_DIR}/app-env-custom-package-cache/pip" "${MP_FAKE_PIP_LOG}"
-assert_contains "UV_CACHE_DIR=${TMP_DIR}/app-env-custom-package-cache/uv" "${MP_FAKE_PIP_LOG}"
+assert_contains "PACKAGE_CACHE_ROOT=${TMP_DIR}/app-env-custom-package-cache" "${MP_FAKE_UV_LOG}"
+assert_contains "UV_CACHE_DIR=${TMP_DIR}/app-env-custom-package-cache/uv" "${MP_FAKE_UV_LOG}"
 
 echo "Docker package env simulation passed"

scripts/dev/simulate_package_installer.py

@@ -21,7 +21,6 @@ def sample(name: str, request: PackageInstallRequest) -> None:
         print(rendered)
         assert all("--proxy" not in arg for arg in strategy.command)
         assert "user:pass" not in rendered
-        assert strategy.env["PIP_CACHE_DIR"].endswith("/.cache/pip")
         assert strategy.env["UV_CACHE_DIR"].endswith("/.cache/uv")
         if strategy.strategy_name.endswith("代理") or strategy.strategy_name.endswith("镜像+代理"):
             assert strategy.env["HTTPS_PROXY"] == "http://proxy.example:7890"
@@ -35,31 +34,31 @@ def main() -> None:
 
     samples = {
         "plain": PackageInstallRequest(
-            requirements_file=requirements,
+            dependency_file=requirements,
             python_bin=python_bin,
             config_dir=config_dir,
         ),
         "mirror": PackageInstallRequest(
-            requirements_file=requirements,
+            dependency_file=requirements,
             python_bin=python_bin,
             config_dir=config_dir,
-            pip_index_url="https://user:pass@mirror.example/simple",
+            package_index_url="https://user:pass@mirror.example/simple",
         ),
         "proxy": PackageInstallRequest(
-            requirements_file=requirements,
+            dependency_file=requirements,
             python_bin=python_bin,
             config_dir=config_dir,
             proxy_url="http://proxy.example:7890",
         ),
         "mirror_proxy_wheels": PackageInstallRequest(
-            requirements_file=requirements,
+            dependency_file=requirements,
             python_bin=python_bin,
             config_dir=config_dir,
             find_links_dirs=[
                 root / "plugins.v2" / "demo" / "wheels",
                 root / "plugins.v2" / "other" / "wheels",
             ],
-            pip_index_url="https://user:pass@mirror.example/simple",
+            package_index_url="https://user:pass@mirror.example/simple",
             proxy_url="http://proxy.example:7890",
         ),
     }