Skip to content

Commit bf60cc4

Browse files
InfinityPacerInfinityPacer
authored
fix(docker): persist CloakBrowser cache (#6344)
1 parent 5128ae9 commit bf60cc4

4 files changed

Lines changed: 414 additions & 30 deletions

File tree

‎docker/browser.sh‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
#!/bin/bash
2+
# shellcheck shell=bash
3+
4+
# 浏览器缓存可由容器环境显式覆盖；未覆盖时优先复用已存在的持久缓存。
5+
function is_cloakbrowser_cache_ready() {
6+
local candidate="${1:-}"
7+
[ -d "${candidate}" ] || return 1
8+
9+
CLOAKBROWSER_CACHE_DIR="${candidate}" "${VENV_PATH}/bin/python3" -c '
10+
import os
11+
from cloakbrowser import binary_info
12+
13+
info = binary_info()
14+
path = info.get("binary_path")
15+
raise SystemExit(0 if info.get("installed") and path and os.access(path, os.X_OK) else 1)
16+
' >/dev/null 2>&1
17+
}
18+
19+
function is_path_mountpoint() {
20+
local candidate="${1:-}"
21+
"${VENV_PATH}/bin/python3" -c '
22+
import os
23+
import sys
24+
25+
raise SystemExit(0 if os.path.ismount(sys.argv[1]) else 1)
26+
' "${candidate}" >/dev/null 2>&1
27+
}
28+
29+
function resolve_browser_cache_dir() {
30+
local explicit_cache="${CLOAKBROWSER_CACHE_DIR:-}"
31+
local browser_cache_root="${CONFIG_DIR}/.browser"
32+
local config_cache="${browser_cache_root}/cloakbrowser"
33+
local legacy_cache="${HOME}/.cloakbrowser"
34+
local selected_cache
35+
local selected_source
36+
37+
if [ -n "${explicit_cache}" ]; then
38+
if [[ "${explicit_cache}" != /* ]]; then
39+
ERROR "→ CLOAKBROWSER_CACHE_DIR 必须是独立的绝对目录：${explicit_cache}"
40+
return 1
41+
fi
42+
explicit_cache="$(python3 -c 'import os, sys; print(os.path.normpath(sys.argv[1]))' "${explicit_cache}")"
43+
if [ "${explicit_cache}" = "/" ] \
44+
|| [ "${explicit_cache}" = "${CONFIG_DIR%/}" ] \
45+
|| [ "${explicit_cache}" = "${HOME%/}" ]; then
46+
ERROR "→ CLOAKBROWSER_CACHE_DIR 不能占用受管根目录：${explicit_cache}"
47+
return 1
48+
fi
49+
selected_cache="${explicit_cache}"
50+
selected_source="容器环境"
51+
elif is_cloakbrowser_cache_ready "${config_cache}"; then
52+
selected_cache="${config_cache}"
53+
selected_source="V3 持久缓存"
54+
elif is_cloakbrowser_cache_ready "${legacy_cache}" || is_path_mountpoint "${legacy_cache}"; then
55+
selected_cache="${legacy_cache}"
56+
selected_source="预发布 V3 兼容缓存"
57+
else
58+
selected_cache="${config_cache}"
59+
selected_source="新安装默认目录"
60+
fi
61+
62+
CLOAKBROWSER_CACHE_DIR="${selected_cache}"
63+
export CLOAKBROWSER_CACHE_DIR
64+
INFO "→ CloakBrowser 缓存目录：${CLOAKBROWSER_CACHE_DIR}（${selected_source}）"
65+
}
66+
67+
# 权限修复跳过大体积缓存子树，仅处理其根目录和直接子项。
68+
function chown_path_excluding_browser_cache() {
69+
local target="${1:-}"
70+
local cache_dir="${CLOAKBROWSER_CACHE_DIR:-}"
71+
72+
[ -e "${target}" ] || return 0
73+
if [ -n "${cache_dir}" ] && [ "${cache_dir}" = "${target}" ]; then
74+
chown -h moviepilot:moviepilot "${target}"
75+
return 0
76+
fi
77+
if [ -n "${cache_dir}" ] && [[ "${cache_dir}" == "${target}"/* ]]; then
78+
find "${target}" -path "${cache_dir}" -prune -o -exec chown -h moviepilot:moviepilot {} +
79+
return 0
80+
fi
81+
chown -R moviepilot:moviepilot "${target}"
82+
}
83+
84+
function prepare_browser_cache_dir() {
85+
if ! mkdir -p "${CLOAKBROWSER_CACHE_DIR}"; then
86+
ERROR "→ 无法创建 CloakBrowser 缓存目录：${CLOAKBROWSER_CACHE_DIR}"
87+
return 1
88+
fi
89+
90+
if [ "${CLOAKBROWSER_CACHE_DIR}" = "${CONFIG_DIR}/.browser/cloakbrowser" ]; then
91+
chown -h moviepilot:moviepilot "${CONFIG_DIR}/.browser"
92+
fi
93+
chown -h moviepilot:moviepilot "${CLOAKBROWSER_CACHE_DIR}"
94+
find "${CLOAKBROWSER_CACHE_DIR}" -mindepth 1 -maxdepth 1 -exec chown -h moviepilot:moviepilot {} +
95+
if is_truthy_value "${MOVIEPILOT_FORCE_CHOWN:-false}"; then
96+
chown -R moviepilot:moviepilot "${CLOAKBROWSER_CACHE_DIR}"
97+
fi
98+
99+
if ! gosu moviepilot:moviepilot sh -c '[ -r "$1" ] && [ -w "$1" ] && [ -x "$1" ]' sh "${CLOAKBROWSER_CACHE_DIR}"; then
100+
ERROR "→ CloakBrowser 缓存目录不可读写：${CLOAKBROWSER_CACHE_DIR}"
101+
return 1
102+
fi
103+
}
104+
105+
function install_browser_kernel() {
106+
local emulation="${BROWSER_EMULATION:-cloakbrowser}"
107+
emulation="$(normalize_env_value "${emulation}")"
108+
local proxy="${HTTPS_PROXY:-${https_proxy:-${PROXY_HOST:-}}}"
109+
110+
if [ "${emulation}" != "cloakbrowser" ] && [ "${emulation}" != "flaresolverr" ] && [ -n "${emulation}" ]; then
111+
WARN "浏览器仿真类型 ${emulation} 已按 CloakBrowser 处理。"
112+
fi
113+
114+
INFO "确保 CloakBrowser 浏览器内核可用"
115+
if [[ "$proxy" =~ ^https?:// ]]; then
116+
HTTPS_PROXY="$proxy" gosu moviepilot:moviepilot "${VENV_PATH}/bin/python3" -m cloakbrowser install
117+
else
118+
gosu moviepilot:moviepilot "${VENV_PATH}/bin/python3" -m cloakbrowser install
119+
fi
120+
}
121+
122+
function ensure_browser_kernel() {
123+
if is_cloakbrowser_cache_ready "${CLOAKBROWSER_CACHE_DIR:-}"; then
124+
INFO "CloakBrowser 浏览器内核已就绪"
125+
return 0
126+
fi
127+
128+
if ! install_browser_kernel; then
129+
WARN "CloakBrowser 浏览器内核安装失败，首次使用时将重试"
130+
fi
131+
}

‎docker/entrypoint.sh‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ function force_chown_image_paths_if_requested() {
385385
}
386386

387387
function correct_home_permissions() {
388+
local child
389+
388390
[ -e "${HOME}" ] || return 0
389391

390392
chown moviepilot:moviepilot "${HOME}"
@@ -396,7 +398,22 @@ function correct_home_permissions() {
396398
INFO "→ 默认跳过 ${HOME}/.cloakbrowser 递归权限校正，如遇浏览器缓存权限错误可设置 MOVIEPILOT_FORCE_CHOWN=true 后重启一次。"
397399
fi
398400

399-
find "${HOME}" -mindepth 1 -maxdepth 1 ! -name ".cloakbrowser" -exec chown -R moviepilot:moviepilot {} +
401+
while IFS= read -r -d '' child; do
402+
[ "${child}" = "${HOME}/.cloakbrowser" ] && continue
403+
chown_path_excluding_browser_cache "${child}"
404+
done < <(find "${HOME}" -mindepth 1 -maxdepth 1 -print0)
405+
}
406+
407+
function correct_config_permissions() {
408+
local child
409+
410+
[ -e "${CONFIG_DIR}" ] || return 0
411+
412+
chown moviepilot:moviepilot "${CONFIG_DIR}"
413+
while IFS= read -r -d '' child; do
414+
[ "${child}" = "${CONFIG_DIR}/.browser" ] && continue
415+
chown_path_excluding_browser_cache "${child}"
416+
done < <(find "${CONFIG_DIR}" -mindepth 1 -maxdepth 1 -print0)
400417
}
401418

402419
function chown_plugin_runtime_path() {
@@ -427,8 +444,8 @@ function correct_file_permissions() {
427444
correct_site_resource_permissions
428445
chown_plugin_runtime_path /app/app/plugins
429446
correct_home_permissions
447+
correct_config_permissions
430448
chown -R moviepilot:moviepilot \
431-
"${CONFIG_DIR}" \
432449
/var/lib/nginx \
433450
/var/log/nginx
434451
chown moviepilot:moviepilot /etc/hosts /tmp
@@ -477,35 +494,27 @@ if [ "${ONE_SHOT_UPDATE_APPLIED}" = "true" ]; then
477494
fi
478495
cd /app || exit
479496

497+
source "/app/docker/browser.sh"
498+
480499
# 更改 moviepilot userid 和 groupid
481500
groupmod -o -g "${PGID}" moviepilot
482501
usermod -o -u "${PUID}" moviepilot
483502

484-
# 更改文件权限
485-
correct_file_permissions
486-
487503
# 启动前优先确认主运行环境仍然健康，避免插件依赖污染导致服务直接起不来。
488504
ensure_backend_runtime_dependencies
489505

490-
# 下载浏览器内核
491-
function install_browser_kernel() {
492-
local emulation="${BROWSER_EMULATION:-cloakbrowser}"
493-
emulation="$(normalize_env_value "${emulation}")"
494-
local proxy="${HTTPS_PROXY:-${https_proxy:-$PROXY_HOST}}"
495-
496-
if [ "${emulation}" != "cloakbrowser" ] && [ "${emulation}" != "flaresolverr" ] && [ -n "${emulation}" ]; then
497-
WARN "浏览器仿真类型 ${emulation} 已按 CloakBrowser 处理。"
498-
fi
499-
500-
INFO "下载 CloakBrowser 浏览器内核"
501-
if [[ "$proxy" =~ ^https?:// ]]; then
502-
HTTPS_PROXY="$proxy" gosu moviepilot:moviepilot python -m cloakbrowser install
503-
else
504-
gosu moviepilot:moviepilot python -m cloakbrowser install
505-
fi
506-
}
506+
# 缓存路径解析必须晚于依赖自愈，确保有效性探针使用当前运行版本。
507+
if ! resolve_browser_cache_dir; then
508+
exit 1
509+
fi
507510

508-
install_browser_kernel
511+
# 权限校正需要避开选中的浏览器缓存子树，避免启动时递归扫描内核文件。
512+
correct_file_permissions
513+
514+
if ! prepare_browser_cache_dir; then
515+
exit 1
516+
fi
517+
ensure_browser_kernel
509518

510519
# 证书管理
511520
source /app/docker/cert.sh

‎docker/update.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ function install_backend_and_download_resources() {
106106
cp /tmp/requirements.txt.backup /app/requirements.txt
107107
return 1
108108
fi
109-
INFO "正在更新 CloakBrowser 浏览器内核"
110-
if ! ${VENV_PATH}/bin/python -m cloakbrowser install; then
111-
WARN "CloakBrowser 浏览器内核更新失败，后续首次使用时可能重新下载"
112-
fi
113109
INFO "依赖更新成功"
114110
else
115111
INFO "依赖无变化，跳过依赖更新"

0 commit comments

Comments
 (0)