一分钟搭建影视站,支持Docker等部署方式
feat: 新增 DEFAULT_IMAGE_MODE 部署默认封面图模式,proxy 模式支持故障回退
bestZwei0d8ddf8de519
diff --git a/src/app/api/status/route.ts b/src/app/api/status/route.tsindex 4af850c..0ec09d2 100644--- a/src/app/api/status/route.ts+++ b/src/app/api/status/route.ts@@ -4,6 +4,7 @@ import { getEnvSources } from '@/lib/env-sources';import { getEnvLiveSources } from '@/lib/env-live-sources';import { getEnvSubscriptions } from '@/lib/env-subscriptions';import { getEnvRecommendSource } from '@/lib/env-recommend-source';+import { getEnvImageMode } from '@/lib/env-image-mode';export const runtime = 'nodejs';@@ -24,5 +25,7 @@ export async function GET(req: Request) {defaultSubscriptions: getEnvSubscriptions(),// 部署者通过 DEFAULT_RECOMMEND_SOURCE 指定的首页推荐数据源默认值(未配置时为 null)defaultRecommendSource: getEnvRecommendSource() ?? null,+ // 部署者通过 DEFAULT_IMAGE_MODE 指定的封面图加载方式默认值(未配置时为 null)+ defaultImageMode: getEnvImageMode() ?? null,});}diff --git a/src/components/source-manager.tsx b/src/components/source-manager.tsxindex ea34214..bd71682 100644--- a/src/components/source-manager.tsx+++ b/src/components/source-manager.tsx@@ -638,7 +638,7 @@ function ImagePanel() {const mode = store.imageProxyMode;const description: Record<'direct' | 'proxy' | 'custom', string> = {direct: '原站直连;豆瓣封面自动换公共镜像,仍失败回退内置代理。最省服务器流量',- proxy: '所有封面经本站服务器转发并伪装来源,最稳定,消耗服务器流量',+ proxy: '封面优先经本站服务器转发并伪装来源,失败自动回退公共镜像/直连。最稳定,消耗服务器流量',custom: '使用你填写的模板转发封面图',};return (diff --git a/src/lib/env-image-mode.test.ts b/src/lib/env-image-mode.test.tsnew file mode 100644index 0000000..ef948ef--- /dev/null+++ b/src/lib/env-image-mode.test.ts@@ -0,0 +1,43 @@+import { afterEach, describe, expect, it, vi } from 'vitest';+import { getEnvImageMode } from './env-image-mode';++const KEY = 'DEFAULT_IMAGE_MODE';+const original = process.env[KEY];++afterEach(() => {+ if (original === undefined) delete process.env[KEY];+ else process.env[KEY] = original;+ vi.restoreAllMocks();+});++describe('getEnvImageMode', () => {+ it('未配置时返回 undefined', () => {+ delete process.env[KEY];+ expect(getEnvImageMode()).toBeUndefined();+ });++ it('空值与纯空白视为未配置', () => {+ for (const v of ['', ' ']) {+ process.env[KEY] = v;+ expect(getEnvImageMode()).toBeUndefined();+ }+ });++ it('合法取值(大小写不敏感,自动去空白)', () => {+ for (const [raw, expected] of [+ ['direct', 'direct'],+ ['PROXY', 'proxy'],+ [' proxy ', 'proxy'],+ ] as const) {+ process.env[KEY] = raw;+ expect(getEnvImageMode()).toBe(expected);+ }+ });++ it('非法取值返回 undefined 而非抛错', () => {+ const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});+ process.env[KEY] = 'custom';+ expect(getEnvImageMode()).toBeUndefined();+ expect(warn).toHaveBeenCalled();+ });+});diff --git a/src/lib/env-image-mode.ts b/src/lib/env-image-mode.tsnew file mode 100644index 0000000..1241f30--- /dev/null+++ b/src/lib/env-image-mode.ts@@ -0,0 +1,19 @@+export type ImageModeValue = 'direct' | 'proxy';++/**+ * 部署者通过 DEFAULT_IMAGE_MODE 环境变量指定的封面图加载方式默认值。+ * 可选值:direct(原站直连优先,省服务器流量)/ proxy(内置代理优先,最稳定)。+ * 不开放 custom——自定义代理模板是每用户手填的本地配置,没有全局模板可下发,+ * 强设 custom 只会让未填模板的用户静默退化为直连。+ * 未配置返回 undefined(沿用内置默认 direct);取值非法时告警并忽略,不影响站点运行。+ */+export function getEnvImageMode(): ImageModeValue | undefined {+ const raw = process.env.DEFAULT_IMAGE_MODE?.trim().toLowerCase();+ if (!raw) return undefined;+ if (raw === 'direct' || raw === 'proxy') return raw;+ console.warn(+ '[LibreTV] DEFAULT_IMAGE_MODE 取值无效,已忽略(可选 direct / proxy):',+ raw+ );+ return undefined;+}diff --git a/src/lib/store.ts b/src/lib/store.tsindex ed9de81..dd6a730 100644--- a/src/lib/store.ts+++ b/src/lib/store.ts@@ -23,6 +23,8 @@ export interface AppSettings {recommendSourceTouched: boolean;autoplayNext: boolean;imageProxyMode: 'direct' | 'proxy' | 'custom';+ /** 用户是否在设置中主动选择过封面图加载方式;为 false 时部署者的 DEFAULT_IMAGE_MODE 默认值可生效 */+ imageProxyModeTouched: boolean;customImageProxy: string;}@@ -294,8 +296,10 @@ export const useAppStore = create<AppState>()(recommendSourceTouched: false,autoplayNext: true,// 直连优先:豆瓣封面有公共镜像 + 内置代理两级兜底(见 buildImageCandidates),- // 默认省服务器流量;老用户保持已持久化的选择不受影响+ // 默认省服务器流量;老用户保持已持久化的选择不受影响。+ // 部署者可用 DEFAULT_IMAGE_MODE=proxy 下发内置代理优先(最稳定,吃服务器流量)imageProxyMode: 'direct',+ imageProxyModeTouched: false,customImageProxy: '',addCustomApi: (api) => {@@ -705,9 +709,10 @@ export const useAppStore = create<AppState>()(},updateSettings: (patch) => {- // 用户主动修改推荐数据源时打上「已选择」标记:此后部署者的- // DEFAULT_RECOMMEND_SOURCE 默认值不再覆盖该用户的选择+ // 用户主动修改推荐数据源 / 封面图加载方式时打上「已选择」标记:此后部署者的+ // DEFAULT_RECOMMEND_SOURCE / DEFAULT_IMAGE_MODE 默认值不再覆盖该用户的选择const touched = 'recommendSource' in patch;+ const imageTouched = 'imageProxyMode' in patch;// 打开成人内容过滤时,同步取消勾选所有成人源,避免两者并存if (patch.yellowFilter === true) {const adultKeys = new Set(@@ -718,11 +723,16 @@ export const useAppStore = create<AppState>()(set({...patch,...(touched ? { recommendSourceTouched: true } : null),+ ...(imageTouched ? { imageProxyModeTouched: true } : null),selectedKeys: get().selectedKeys.filter((k) => !adultKeys.has(k)),});return;}- set(touched ? { ...patch, recommendSourceTouched: true } : patch);+ set({+ ...patch,+ ...(touched ? { recommendSourceTouched: true } : null),+ ...(imageTouched ? { imageProxyModeTouched: true } : null),+ });},}),{@@ -778,6 +788,7 @@ export const useAppStore = create<AppState>()(recommendSourceTouched: s.recommendSourceTouched,autoplayNext: s.autoplayNext,imageProxyMode: s.imageProxyMode,+ imageProxyModeTouched: s.imageProxyModeTouched,customImageProxy: s.customImageProxy,}),// 同步 storage 会在模块加载时立即 rehydrate(早于 React hydration),diff --git a/src/lib/subscription-sync.test.ts b/src/lib/subscription-sync.test.tsindex 2d96466..79f3d61 100644--- a/src/lib/subscription-sync.test.ts+++ b/src/lib/subscription-sync.test.ts@@ -33,6 +33,7 @@ const status = (over: Partial<AuthStatusResponse> = {}): AuthStatusResponse => (defaultLiveSources: [],defaultSubscriptions: [],defaultRecommendSource: null,+ defaultImageMode: null,...over,});@@ -174,3 +175,51 @@ describe('applyEnvPresets · DEFAULT_RECOMMEND_SOURCE(issue #918)', () => {expect(useAppStore.getState().recommendSourceTouched).toBe(false);});});++describe('applyEnvPresets · DEFAULT_IMAGE_MODE', () => {+ it('未配置时不改动封面图加载方式', async () => {+ useAppStore.setState({ imageProxyMode: 'direct', imageProxyModeTouched: false });+ await applyEnvPresets(status());+ expect(useAppStore.getState().imageProxyMode).toBe('direct');+ });++ it('对未主动选择过的用户应用部署者默认值,且不打「已选择」标记', async () => {+ useAppStore.setState({ imageProxyMode: 'direct', imageProxyModeTouched: false });+ await applyEnvPresets(status({ defaultImageMode: 'proxy' }));+ expect(useAppStore.getState().imageProxyMode).toBe('proxy');+ // 自动预置不算用户主动选择:部署者日后调整默认值时该用户应跟随+ expect(useAppStore.getState().imageProxyModeTouched).toBe(false);+ });++ it('已主动选择过的用户(如 proxy)不被覆盖', async () => {+ useAppStore.setState({ imageProxyMode: 'proxy', imageProxyModeTouched: true });+ await applyEnvPresets(status({ defaultImageMode: 'proxy' }));+ expect(useAppStore.getState().imageProxyMode).toBe('proxy');+ });++ it('显式选回 direct 的用户(带「已选择」标记)不被覆盖', async () => {+ useAppStore.setState({ imageProxyMode: 'direct', imageProxyModeTouched: true });+ await applyEnvPresets(status({ defaultImageMode: 'proxy' }));+ expect(useAppStore.getState().imageProxyMode).toBe('direct');+ });++ it('存量用户:从未打过标记但偏好已不是出厂默认值的(老版本手动改过)不被覆盖', async () => {+ useAppStore.setState({ imageProxyMode: 'proxy', imageProxyModeTouched: false });+ await applyEnvPresets(status({ defaultImageMode: 'direct' }));+ expect(useAppStore.getState().imageProxyMode).toBe('proxy');+ });++ it('custom 模式(需手填模板,视为明确选择)不被覆盖', async () => {+ useAppStore.setState({ imageProxyMode: 'custom', imageProxyModeTouched: false });+ await applyEnvPresets(status({ defaultImageMode: 'direct' }));+ expect(useAppStore.getState().imageProxyMode).toBe('custom');+ });++ it('重复调用幂等:应用一次后再调用不改变结果', async () => {+ useAppStore.setState({ imageProxyMode: 'direct', imageProxyModeTouched: false });+ await applyEnvPresets(status({ defaultImageMode: 'proxy' }));+ await applyEnvPresets(status({ defaultImageMode: 'proxy' }));+ expect(useAppStore.getState().imageProxyMode).toBe('proxy');+ expect(useAppStore.getState().imageProxyModeTouched).toBe(false);+ });+});diff --git a/src/lib/subscription-sync.ts b/src/lib/subscription-sync.tsindex cdbfc59..1e26d88 100644--- a/src/lib/subscription-sync.ts+++ b/src/lib/subscription-sync.ts@@ -127,4 +127,15 @@ export async function applyEnvPresets(status: AuthStatusResponse): Promise<void>useAppStore.setState({ recommendSource: status.defaultRecommendSource });}}+ // 部署者通过 DEFAULT_IMAGE_MODE 指定的封面图加载方式默认值(未配置时不改动)。+ // 与推荐数据源同一套语义:仅对未主动选择过的用户生效(仍为出厂默认 direct 且无+ // 「已选择」标记),已有偏好的用户——包括 touched 标记上线前手动改过的——不被覆盖;+ // custom 需要手填模板,无论有无标记都视为明确选择,不覆盖。+ // 直写 setState 而非 updateSettings:自动预置不算用户主动选择,不打「已选择」标记。+ if (status.defaultImageMode) {+ const s = useAppStore.getState();+ if (!s.imageProxyModeTouched && s.imageProxyMode === 'direct') {+ useAppStore.setState({ imageProxyMode: status.defaultImageMode });+ }+ }}diff --git a/src/lib/types.ts b/src/lib/types.tsindex 1e74dbc..070dcda 100644--- a/src/lib/types.ts+++ b/src/lib/types.ts@@ -104,6 +104,8 @@ export interface AuthStatusResponse {defaultSubscriptions: { url: string; name?: string }[];/** 部署者通过 DEFAULT_RECOMMEND_SOURCE 环境变量指定的首页推荐数据源默认值(未配置时为 null) */defaultRecommendSource: 'douban' | 'bangumi' | 'hot-list' | null;+ /** 部署者通过 DEFAULT_IMAGE_MODE 环境变量指定的封面图加载方式默认值(未配置时为 null) */+ defaultImageMode: 'direct' | 'proxy' | null;}// —— 直播 / IPTV ——diff --git a/src/lib/utils.test.ts b/src/lib/utils.test.tsindex d476fef..df73a4b 100644--- a/src/lib/utils.test.ts+++ b/src/lib/utils.test.ts@@ -42,8 +42,23 @@ describe('buildImageCandidates', () => {expect(cands[0]).toBe('https://doubanio.com/a.jpg');});- it('proxy / custom 模式为单一候选', () => {- expect(buildImageCandidates(DOUBAN, 'proxy', '')).toHaveLength(1);+ it('proxy 模式豆瓣图:内置代理 → 双镜像 → 直连(代理故障可回退)', () => {+ expect(buildImageCandidates(DOUBAN, 'proxy', '')).toEqual([+ '/api/proxy?url=' + encodeURIComponent(DOUBAN),+ 'https://img.doubanio.cmliussss.net/view/photo/m/poster.jpg',+ 'https://img.doubanio.cmliussss.com/view/photo/m/poster.jpg',+ DOUBAN,+ ]);+ });++ it('proxy 模式非豆瓣图:内置代理 → 直连', () => {+ expect(buildImageCandidates('https://bdstatic.com/x.jpg', 'proxy', '')).toEqual([+ '/api/proxy?url=' + encodeURIComponent('https://bdstatic.com/x.jpg'),+ 'https://bdstatic.com/x.jpg',+ ]);+ });++ it('custom 模式为单一候选(模板错误显式暴露,不静默回退)', () => {expect(buildImageCandidates(DOUBAN, 'custom', 'https://p.example.com/?u=')).toHaveLength(1);expect(buildImageCandidates(undefined, 'direct', '')).toEqual([]);});diff --git a/src/lib/utils.ts b/src/lib/utils.tsindex 2266b8c..bd60150 100644--- a/src/lib/utils.ts+++ b/src/lib/utils.ts@@ -51,12 +51,13 @@ export function buildImageUrl(}/**- * 封面图降级候选链,direct 模式下由 SmartImage 按序尝试(onError 逐级回退):- * - 豆瓣图(img*.doubanio.com):原站直连 → cmliussss 公共镜像(腾讯 / 阿里)→ 内置代理。+ * 封面图降级候选链,各模式首选地址失败后由 SmartImage 按序回退(onError 逐级尝试):+ * - direct 模式:原站直连 → cmliussss 公共镜像(腾讯 / 阿里,仅豆瓣图)→ 内置代理。* doubanio 反爬对外域与空 Referer 分别返回 403 / 418,纯前端无法绕过;* 公共镜像实测直连可用,置于自家代理之前以节省服务器流量。- * - 其他图床:原站直连 → 内置代理。- * proxy / custom 模式为单一地址,无降级链。+ * - proxy 模式:内置代理 → 公共镜像(仅豆瓣图)→ 原站直连。+ * 代理是全站封面的公共依赖,不能单点——代理故障时自动落到直连/镜像。+ * - custom 模式为单一地址:模板错误应显式暴露,不被静默回退掩盖。*/export function buildImageCandidates(url: string | undefined,@@ -64,15 +65,18 @@ export function buildImageCandidates(customTemplate: string): string[] {const built = buildImageUrl(url, mode, customTemplate);- if (!built) return [];- if (mode !== 'direct' || !url) return [built];- const candidates = [built];- if (url.includes('doubanio.com')) {- candidates.push(url.replace(/img\d+\.doubanio\.com/g, 'img.doubanio.cmliussss.net'));- candidates.push(url.replace(/img\d+\.doubanio\.com/g, 'img.doubanio.cmliussss.com'));+ if (!built || !url) return [];+ const mirrors = url.includes('doubanio.com')+ ? [+ url.replace(/img\d+\.doubanio\.com/g, 'img.doubanio.cmliussss.net'),+ url.replace(/img\d+\.doubanio\.com/g, 'img.doubanio.cmliussss.com'),+ ]+ : [];+ if (mode === 'proxy') {+ return [...new Set([built, ...mirrors, url])];}- candidates.push(`/api/proxy?url=${encodeURIComponent(url)}`);- return [...new Set(candidates)];+ if (mode !== 'direct') return [built];+ return [...new Set([built, ...mirrors, `/api/proxy?url=${encodeURIComponent(url)}`])];}export function validateSourceUrl(url: string): boolean {