一分钟搭建影视站,支持Docker等部署方式
feat: 新增 DEFAULT_RECOMMEND_SOURCE 环境变量自定义首页推荐数据源默认值
bestZwei3d73f8ce211e
diff --git a/README.md b/README.mdindex af72221..b9ccd3b 100644--- a/README.md+++ b/README.md@@ -54,6 +54,7 @@ services:# - DEFAULT_SOURCES=[{"name":"示例源","url":"https://example.com/api.php/provide/vod"}]# - DEFAULT_LIVE_SOURCES=[{"name":"示例直播源","url":"https://example.com/list.m3u"}]# - DEFAULT_SUBSCRIPTIONS=["https://example.com/sources.json"] # 预置订阅,自动导入点播源+直播源+ # - DEFAULT_RECOMMEND_SOURCE=douban # 首页推荐数据源默认值(douban/bangumi/hot-list),仅对未主动选择过的用户生效# - LIVE_ALLOW_PRIVATE=1 # 自建内网 IPTV 源时开启```@@ -97,6 +98,7 @@ PASSWORD=your-password npm start # 监听 8080| `60S_API_BASE` | 否 | 影视榜单推荐源(60s API)实例地址,默认 `https://60s.crystelf.top`;有限流,高频使用可[自部署](https://github.com/vikiboss/60s) || `DEFAULT_LIVE_SOURCES` | 否 | 预置直播源(M3U 订阅),JSON 数组:`[{"name":"源名","url":"https://.../list.m3u","epg":"https://.../epg.xml.gz"}]`,`epg` 为可选的 XMLTV 节目单地址 || `DEFAULT_SUBSCRIPTIONS` | 否 | 预置数据源订阅(LibreTV-SourceList JSON 链接,也接受 TVBOX 配置地址),JSON 数组:`["https://.../sources.json", {"url":"https://.../list.json","name":"名称"}]`。首次访问自动导入点播源与直播源,之后每 24h 静默刷新;用户删除后不再自动加回 |+| `DEFAULT_RECOMMEND_SOURCE` | 否 | 首页推荐数据源的默认值(`douban` / `bangumi` / `hot-list`,出厂默认 `hot-list`);仅对未在设置中主动选择过的用户生效,用户的选择始终优先 || `LIVE_ALLOW_PRIVATE` | 否 | 设为 `1` 时允许直播流代理访问内网/保留地址(自建 IPTV 场景),默认关闭以维持 SSRF 防护 |## 使用说明diff --git a/docker-compose.yml b/docker-compose.ymlindex 339ec76..b344e41 100644--- a/docker-compose.yml+++ b/docker-compose.yml@@ -24,6 +24,8 @@ services:# - DEFAULT_LIVE_SOURCES=[{"name":"示例直播源","url":"https://example.com/list.m3u","epg":"https://example.com/epg.xml.gz"}]# 可选:预置数据源订阅(SourceList JSON 链接,一次下发点播源 + 直播源)# - DEFAULT_SUBSCRIPTIONS=["https://example.com/sources.json"]+ # 可选:首页推荐数据源默认值(douban / bangumi / hot-list),仅对未主动选择过的用户生效+ # - DEFAULT_RECOMMEND_SOURCE=douban# 可选:自建内网 IPTV 放行(对拉列表、测活、拉流三个阶段同时生效,默认关闭以维持 SSRF 防护)# - LIVE_ALLOW_PRIVATE=1# 可选:代理上游请求超时(毫秒)与重试次数diff --git a/src/app/api/status/route.ts b/src/app/api/status/route.tsindex 3b2135a..4af850c 100644--- a/src/app/api/status/route.ts+++ b/src/app/api/status/route.ts@@ -3,6 +3,7 @@ import { isPasswordConfigured, sessionFromCookieHeader } from '@/lib/auth';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';export const runtime = 'nodejs';@@ -21,5 +22,7 @@ export async function GET(req: Request) {defaultLiveSources: getEnvLiveSources(),// 部署者通过 DEFAULT_SUBSCRIPTIONS 预置的 SourceList 订阅链接defaultSubscriptions: getEnvSubscriptions(),+ // 部署者通过 DEFAULT_RECOMMEND_SOURCE 指定的首页推荐数据源默认值(未配置时为 null)+ defaultRecommendSource: getEnvRecommendSource() ?? null,});}diff --git a/src/lib/env-recommend-source.test.ts b/src/lib/env-recommend-source.test.tsnew file mode 100644index 0000000..026387d--- /dev/null+++ b/src/lib/env-recommend-source.test.ts@@ -0,0 +1,40 @@+import { afterEach, describe, expect, it } from 'vitest';+import { getEnvRecommendSource } from './env-recommend-source';++const KEY = 'DEFAULT_RECOMMEND_SOURCE';+const original = process.env[KEY];++afterEach(() => {+ if (original === undefined) delete process.env[KEY];+ else process.env[KEY] = original;+});++describe('getEnvRecommendSource', () => {+ it('未配置时返回 undefined', () => {+ delete process.env[KEY];+ expect(getEnvRecommendSource()).toBeUndefined();+ });++ it('空值与纯空白视为未配置', () => {+ for (const v of ['', ' ']) {+ process.env[KEY] = v;+ expect(getEnvRecommendSource()).toBeUndefined();+ }+ });++ it('三个合法取值(大小写不敏感,自动去空白)', () => {+ for (const [raw, expected] of [+ ['douban', 'douban'],+ ['BANGUMI', 'bangumi'],+ [' hot-list ', 'hot-list'],+ ] as const) {+ process.env[KEY] = raw;+ expect(getEnvRecommendSource()).toBe(expected);+ }+ });++ it('非法取值返回 undefined 而非抛错', () => {+ process.env[KEY] = 'maoyan';+ expect(getEnvRecommendSource()).toBeUndefined();+ });+});diff --git a/src/lib/env-recommend-source.ts b/src/lib/env-recommend-source.tsnew file mode 100644index 0000000..7db8072--- /dev/null+++ b/src/lib/env-recommend-source.ts@@ -0,0 +1,17 @@+export type RecommendSourceValue = 'douban' | 'bangumi' | 'hot-list';++/**+ * 部署者通过 DEFAULT_RECOMMEND_SOURCE 环境变量指定的首页推荐数据源默认值。+ * 可选值:douban(豆瓣热门)/ bangumi(Bangumi 新番放送)/ hot-list(影视热榜)。+ * 未配置返回 undefined(沿用内置默认 hot-list);取值非法时告警并忽略,不影响站点运行。+ */+export function getEnvRecommendSource(): RecommendSourceValue | undefined {+ const raw = process.env.DEFAULT_RECOMMEND_SOURCE?.trim().toLowerCase();+ if (!raw) return undefined;+ if (raw === 'douban' || raw === 'bangumi' || raw === 'hot-list') return raw;+ console.warn(+ '[LibreTV] DEFAULT_RECOMMEND_SOURCE 取值无效,已忽略(可选 douban / bangumi / hot-list):',+ raw+ );+ return undefined;+}diff --git a/src/lib/store.ts b/src/lib/store.tsindex 346721f..640203a 100644--- a/src/lib/store.ts+++ b/src/lib/store.ts@@ -19,6 +19,8 @@ export interface AppSettings {doubanEnabled: boolean;/** 首页推荐数据源:豆瓣热门 / Bangumi 每日放送(免 key)/ 影视热榜(60s API) */recommendSource: 'douban' | 'bangumi' | 'hot-list';+ /** 用户是否在设置中主动选择过推荐数据源;为 false 时部署者的 DEFAULT_RECOMMEND_SOURCE 默认值可生效 */+ recommendSourceTouched: boolean;autoplayNext: boolean;imageProxyMode: 'direct' | 'proxy' | 'custom';customImageProxy: string;@@ -289,6 +291,7 @@ export const useAppStore = create<AppState>()(adFilter: true,doubanEnabled: true,recommendSource: 'hot-list',+ recommendSourceTouched: false,autoplayNext: true,imageProxyMode: 'proxy',customImageProxy: '',@@ -700,6 +703,9 @@ export const useAppStore = create<AppState>()(},updateSettings: (patch) => {+ // 用户主动修改推荐数据源时打上「已选择」标记:此后部署者的+ // DEFAULT_RECOMMEND_SOURCE 默认值不再覆盖该用户的选择+ const touched = 'recommendSource' in patch;// 打开成人内容过滤时,同步取消勾选所有成人源,避免两者并存if (patch.yellowFilter === true) {const adultKeys = new Set(@@ -709,11 +715,12 @@ export const useAppStore = create<AppState>()();set({...patch,+ ...(touched ? { recommendSourceTouched: true } : null),selectedKeys: get().selectedKeys.filter((k) => !adultKeys.has(k)),});return;}- set(patch);+ set(touched ? { ...patch, recommendSourceTouched: true } : patch);},}),{@@ -766,6 +773,7 @@ export const useAppStore = create<AppState>()(adFilter: s.adFilter,doubanEnabled: s.doubanEnabled,recommendSource: s.recommendSource,+ recommendSourceTouched: s.recommendSourceTouched,autoplayNext: s.autoplayNext,imageProxyMode: s.imageProxyMode,customImageProxy: s.customImageProxy,diff --git a/src/lib/subscription-sync.test.ts b/src/lib/subscription-sync.test.tsindex fde8c74..2d96466 100644--- a/src/lib/subscription-sync.test.ts+++ b/src/lib/subscription-sync.test.ts@@ -32,6 +32,7 @@ const status = (over: Partial<AuthStatusResponse> = {}): AuthStatusResponse => (defaultSources: [],defaultLiveSources: [],defaultSubscriptions: [],+ defaultRecommendSource: null,...over,});@@ -131,3 +132,45 @@ describe('applyEnvPresets', () => {expect(fetchSourceList).not.toHaveBeenCalled();});});++describe('applyEnvPresets · DEFAULT_RECOMMEND_SOURCE(issue #918)', () => {+ it('未配置时不改动推荐数据源', async () => {+ useAppStore.setState({ recommendSource: 'hot-list', recommendSourceTouched: false });+ await applyEnvPresets(status());+ expect(useAppStore.getState().recommendSource).toBe('hot-list');+ });++ it('对未主动选择过的用户应用部署者默认值,且不打「已选择」标记', async () => {+ useAppStore.setState({ recommendSource: 'hot-list', recommendSourceTouched: false });+ await applyEnvPresets(status({ defaultRecommendSource: 'douban' }));+ expect(useAppStore.getState().recommendSource).toBe('douban');+ // 自动预置不算用户主动选择:部署者日后调整默认值时该用户应跟随+ expect(useAppStore.getState().recommendSourceTouched).toBe(false);+ });++ it('已主动选择过的用户(如 bangumi)不被覆盖', async () => {+ useAppStore.setState({ recommendSource: 'bangumi', recommendSourceTouched: true });+ await applyEnvPresets(status({ defaultRecommendSource: 'douban' }));+ expect(useAppStore.getState().recommendSource).toBe('bangumi');+ });++ it('显式选回 hot-list 的用户(带「已选择」标记)不被覆盖', async () => {+ useAppStore.setState({ recommendSource: 'hot-list', recommendSourceTouched: true });+ await applyEnvPresets(status({ defaultRecommendSource: 'douban' }));+ expect(useAppStore.getState().recommendSource).toBe('hot-list');+ });++ it('存量用户:从未打过标记但偏好已不是出厂默认值的(老版本手动改过)不被覆盖', async () => {+ useAppStore.setState({ recommendSource: 'bangumi', recommendSourceTouched: false });+ await applyEnvPresets(status({ defaultRecommendSource: 'douban' }));+ expect(useAppStore.getState().recommendSource).toBe('bangumi');+ });++ it('重复调用幂等:应用一次后再调用不改变结果', async () => {+ useAppStore.setState({ recommendSource: 'hot-list', recommendSourceTouched: false });+ await applyEnvPresets(status({ defaultRecommendSource: 'douban' }));+ await applyEnvPresets(status({ defaultRecommendSource: 'douban' }));+ expect(useAppStore.getState().recommendSource).toBe('douban');+ expect(useAppStore.getState().recommendSourceTouched).toBe(false);+ });+});diff --git a/src/lib/subscription-sync.ts b/src/lib/subscription-sync.tsindex 8f945e6..cdbfc59 100644--- a/src/lib/subscription-sync.ts+++ b/src/lib/subscription-sync.ts@@ -116,4 +116,15 @@ export async function applyEnvPresets(status: AuthStatusResponse): Promise<void>if (Array.isArray(status.defaultSubscriptions) && status.defaultSubscriptions.length > 0) {await syncEnvSubscriptions(status.defaultSubscriptions);}+ // 部署者通过 DEFAULT_RECOMMEND_SOURCE 指定的推荐数据源默认值:+ // 仅对未主动选择过的用户生效(仍为出厂默认 hot-list 且无「已选择」标记),+ // 已有偏好的用户——包括清缓存前做过选择的——不被覆盖,用户的选择始终优先。+ // 直写 setState 而非 updateSettings:自动预置不算用户主动选择,不打「已选择」标记;+ // 应用后当前值 ≠ hot-list,AuthProvider 的幂等重入天然跳过。+ if (status.defaultRecommendSource) {+ const s = useAppStore.getState();+ if (!s.recommendSourceTouched && s.recommendSource === 'hot-list') {+ useAppStore.setState({ recommendSource: status.defaultRecommendSource });+ }+ }}diff --git a/src/lib/types.ts b/src/lib/types.tsindex e541f66..1e74dbc 100644--- a/src/lib/types.ts+++ b/src/lib/types.ts@@ -102,6 +102,8 @@ export interface AuthStatusResponse {defaultLiveSources: LiveSourceConfig[];/** 部署者通过 DEFAULT_SUBSCRIPTIONS 环境变量预置的 SourceList 订阅链接(未配置时为空数组) */defaultSubscriptions: { url: string; name?: string }[];+ /** 部署者通过 DEFAULT_RECOMMEND_SOURCE 环境变量指定的首页推荐数据源默认值(未配置时为 null) */+ defaultRecommendSource: 'douban' | 'bangumi' | 'hot-list' | null;}// —— 直播 / IPTV ——