Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 katelya
|
6f9c2f01e2 | ||
|
katelya
|
b365be91e0 | ||
|
katelya
|
f5de700f0f | ||
 Katelya
|
2e8ad3d429 | ||
|
katelya
|
c582366206 | ||
|
katelya
|
d268fa7dd5 | ||
|
katelya
|
d410bde28c | ||
|
katelya
|
d5726c4f07 | ||
|
Katelya
|
e24dcf087e | ||
|
katelya
|
7d9675d617 | ||
|
katelya
|
a6bcb72987 | ||
|
katelya
|
5bbea4f3d5 | ||
|
katelya
|
0ceed4a5f7 | ||
|
katelya
|
348494336a | ||
|
katelya
|
d9d50891f2 | ||
|
katelya
|
cd12ebea76 | ||
|
Katelya
|
36c9a6be20 | ||
|
Katelya
|
8c698ceb7d | ||
|
katelya
|
419c686879 | ||
|
katelya
|
ec8111243a | ||
|
Katelya
|
41ea51baae | ||
|
katelya
|
d639bbe415 | ||
|
katelya
|
dc336af4da | ||
|
katelya
|
3ba6e798f6 | ||
|
katelya
|
8da7d1153f | ||
|
katelya
|
63c5e94f25 | ||
|
katelya
|
ab4e58dc4c | ||
|
Katelya
|
ea057e7c53 | ||
|
katelya
|
4d4f2ab665 | ||
|
katelya
|
97f2bdae97 | ||
|
katelya
|
1e0c079957 |
@@ -0,0 +1,53 @@
|
||||
# Dependencies
|
||||
node_modules/
|
||||
.pnpm-store/
|
||||
|
||||
# Build outputs
|
||||
.next/
|
||||
out/
|
||||
dist/
|
||||
build/
|
||||
|
||||
# Cache directories
|
||||
.cache/
|
||||
.parcel-cache/
|
||||
|
||||
# Environment files
|
||||
.env
|
||||
.env.local
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
|
||||
# Log files
|
||||
*.log
|
||||
logs/
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/
|
||||
.idea/
|
||||
*.swp
|
||||
*.swo
|
||||
|
||||
# OS generated files
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
._*
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
|
||||
# PWA Service Worker files (auto-generated)
|
||||
public/sw.js
|
||||
public/workbox-*.js
|
||||
|
||||
# Generated files
|
||||
src/lib/runtime.ts
|
||||
manifest.json
|
||||
|
||||
# Test coverage
|
||||
coverage/
|
||||
|
||||
# Storybook build outputs
|
||||
storybook-static/
|
||||
+36
-36
@@ -9,41 +9,41 @@ tag-template: 'v$RESOLVED_VERSION'
|
||||
# 发布说明模板
|
||||
body-template: |
|
||||
## 🎉 新版本发布
|
||||
|
||||
|
||||
**版本号**: $RESOLVED_VERSION
|
||||
**发布日期**: $RELEASE_DATE
|
||||
|
||||
|
||||
### ✨ 新功能
|
||||
$CHANGES
|
||||
|
||||
|
||||
### 🐛 修复
|
||||
$FIXES
|
||||
|
||||
|
||||
### 🔧 改进
|
||||
$IMPROVEMENTS
|
||||
|
||||
|
||||
### 📝 文档更新
|
||||
$DOCS
|
||||
|
||||
|
||||
### 🚀 部署说明
|
||||
|
||||
|
||||
#### Docker 部署
|
||||
```bash
|
||||
docker pull ghcr.io/senshinya/moontv:v$RESOLVED_VERSION
|
||||
docker run -d --name moontv -p 3000:3000 --env PASSWORD=your_password ghcr.io/senshinya/moontv:v$RESOLVED_VERSION
|
||||
docker pull ghcr.io/katelya77/katelyatv:v$RESOLVED_VERSION
|
||||
docker run -d --name katelyatv -p 3000:3000 --env PASSWORD=your_password ghcr.io/katelya77/katelyatv:v$RESOLVED_VERSION
|
||||
```
|
||||
|
||||
|
||||
#### 环境变量更新
|
||||
请查看 [README.md](README.md) 了解最新的环境变量配置。
|
||||
|
||||
|
||||
### 📋 完整更新日志
|
||||
查看 [CHANGELOG.md](CHANGELOG.md) 了解详细的更新历史。
|
||||
|
||||
|
||||
### 🔗 相关链接
|
||||
- [项目主页](https://github.com/senshinya/moontv)
|
||||
- [在线演示](https://moontv.vercel.app)
|
||||
- [问题反馈](https://github.com/senshinya/moontv/issues)
|
||||
- [功能建议](https://github.com/senshinya/moontv/discussions)
|
||||
- [项目主页](https://github.com/katelya77/KatelyaTV)
|
||||
- [在线演示](https://katelyatv.vercel.app)
|
||||
- [问题反馈](https://github.com/katelya77/KatelyaTV/issues)
|
||||
- [功能建议](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
|
||||
# 发布配置
|
||||
prerelease: false
|
||||
@@ -96,63 +96,63 @@ categories:
|
||||
# 模板配置
|
||||
template: |
|
||||
## 🎯 发布概述
|
||||
|
||||
|
||||
本次发布包含以下主要更新：
|
||||
|
||||
|
||||
### ✨ 新功能
|
||||
- 新增观看历史记录功能，支持断点续播
|
||||
- 集成豆瓣热门推荐系统
|
||||
- 支持 PWA 安装和离线缓存
|
||||
- 新增多用户权限管理系统
|
||||
|
||||
|
||||
### 🐛 问题修复
|
||||
- 修复播放进度记录丢失问题
|
||||
- 优化视频播放器兼容性
|
||||
- 修复移动端响应式布局问题
|
||||
|
||||
|
||||
### 🔧 性能优化
|
||||
- 优化搜索接口响应速度
|
||||
- 改进缓存策略，减少重复请求
|
||||
- 优化数据库查询性能
|
||||
|
||||
|
||||
### 📱 用户体验
|
||||
- 新增深色模式支持
|
||||
- 优化移动端操作体验
|
||||
- 改进错误提示和加载状态
|
||||
|
||||
|
||||
## 🚀 快速开始
|
||||
|
||||
|
||||
1. **Docker 部署**（推荐）
|
||||
```bash
|
||||
docker pull ghcr.io/senshinya/moontv:v$RESOLVED_VERSION
|
||||
docker run -d --name moontv -p 3000:3000 --env PASSWORD=your_password ghcr.io/senshinya/moontv:v$RESOLVED_VERSION
|
||||
docker pull ghcr.io/katelya77/katelyatv:v$RESOLVED_VERSION
|
||||
docker run -d --name katelyatv -p 3000:3000 --env PASSWORD=your_password ghcr.io/katelya77/katelyatv:v$RESOLVED_VERSION
|
||||
```
|
||||
|
||||
|
||||
2. **Vercel 部署**
|
||||
- Fork 本仓库
|
||||
- 在 Vercel 中导入项目
|
||||
- 设置环境变量 PASSWORD
|
||||
- 自动部署完成
|
||||
|
||||
|
||||
3. **Cloudflare Pages 部署**
|
||||
- Fork 本仓库
|
||||
- 在 Cloudflare Pages 中导入项目
|
||||
- 设置构建命令：`pnpm run pages:build`
|
||||
- 配置环境变量
|
||||
|
||||
|
||||
## 📋 环境变量
|
||||
|
||||
|
||||
| 变量 | 说明 | 默认值 |
|
||||
|------|------|--------|
|
||||
| PASSWORD | 访问密码 | 必填 |
|
||||
| NEXT_PUBLIC_STORAGE_TYPE | 存储类型 | localstorage |
|
||||
| USERNAME | 管理员账号 | 空 |
|
||||
|
||||
|
||||
更多环境变量请查看 [README.md](README.md)
|
||||
|
||||
|
||||
## 🔗 相关资源
|
||||
|
||||
- [项目文档](https://github.com/senshinya/moontv#readme)
|
||||
- [问题反馈](https://github.com/senshinya/moontv/issues)
|
||||
- [功能讨论](https://github.com/senshinya/moontv/discussions)
|
||||
- [贡献指南](https://github.com/senshinya/moontv/blob/main/CONTRIBUTING.md)
|
||||
|
||||
- [项目文档](https://github.com/katelya77/KatelyaTV#readme)
|
||||
- [问题反馈](https://github.com/katelya77/KatelyaTV/issues)
|
||||
- [功能讨论](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
- [贡献指南](https://github.com/katelya77/KatelyaTV/blob/main/CONTRIBUTING.md)
|
||||
|
||||
+61
-208
@@ -13,60 +13,44 @@ jobs:
|
||||
packages: write
|
||||
discussions: write
|
||||
issues: write
|
||||
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '18'
|
||||
# 修改这里：改为 pnpm 或者移除 cache 配置
|
||||
# cache: 'npm' # 删除这行，因为使用的是 pnpm
|
||||
|
||||
|
||||
- name: Setup pnpm
|
||||
uses: pnpm/action-setup@v2
|
||||
with:
|
||||
version: 8
|
||||
# 添加 pnpm 缓存配置
|
||||
run_install: false
|
||||
|
||||
- name: Get pnpm store directory
|
||||
shell: bash
|
||||
run: |
|
||||
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
||||
|
||||
|
||||
- name: Setup pnpm cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ env.STORE_PATH }}
|
||||
path: ~/.pnpm-store
|
||||
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-pnpm-store-
|
||||
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
|
||||
- name: Build project
|
||||
run: pnpm run build
|
||||
env:
|
||||
PASSWORD: ${{ secrets.PASSWORD }}
|
||||
|
||||
|
||||
- name: Create Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
.next/**/*
|
||||
public/**/*
|
||||
package.json
|
||||
README.md
|
||||
CHANGELOG.md
|
||||
LICENSE
|
||||
config.json
|
||||
pnpm-lock.yaml
|
||||
next.config.js
|
||||
tailwind.config.ts
|
||||
tsconfig.json
|
||||
@@ -75,218 +59,87 @@ jobs:
|
||||
generate_release_notes: true
|
||||
draft: false
|
||||
prerelease: false
|
||||
title: '🎉 Release ${{ github.ref_name }}'
|
||||
tag_name: ${{ github.ref_name }}
|
||||
name: '🎉 Release ${{ github.ref_name }}'
|
||||
body: |
|
||||
## 🎉 新版本发布
|
||||
|
||||
|
||||
**版本号**: ${{ github.ref_name }}
|
||||
**发布日期**: ${{ github.event.head_commit.timestamp }}
|
||||
|
||||
|
||||
### 🚀 快速开始
|
||||
|
||||
|
||||
#### Docker 部署（推荐）
|
||||
```bash
|
||||
docker pull ghcr.io/senshinya/moontv:${{ github.ref_name }}
|
||||
docker run -d --name moontv -p 3000:3000 --env PASSWORD=your_password ghcr.io/senshinya/moontv:${{ github.ref_name }}
|
||||
docker pull ghcr.io/katelya77/katelyatv:${{ github.ref_name }}
|
||||
docker run -d --name katelyatv -p 3000:3000 --env PASSWORD=your_password ghcr.io/katelya77/katelyatv:${{ github.ref_name }}
|
||||
```
|
||||
|
||||
#### Vercel 部署
|
||||
- Fork 本仓库
|
||||
- 在 Vercel 中导入项目
|
||||
- 设置环境变量 PASSWORD
|
||||
- 自动部署完成
|
||||
|
||||
|
||||
#### Cloudflare Pages 部署
|
||||
- Fork 本仓库
|
||||
- 在 Cloudflare Pages 中导入项目
|
||||
- 设置构建命令：`pnpm run pages:build`
|
||||
- 配置环境变量
|
||||
|
||||
- 构建命令：`pnpm pages:build`
|
||||
- 输出目录：`.vercel/output/static`
|
||||
|
||||
#### Vercel 部署
|
||||
- Fork 本仓库
|
||||
- 在 Vercel 中导入项目
|
||||
- 构建命令：`pnpm run build`
|
||||
|
||||
### 📋 环境变量
|
||||
|
||||
|
||||
| 变量 | 说明 | 默认值 |
|
||||
|------|------|--------|
|
||||
| PASSWORD | 访问密码 | 必填 |
|
||||
| NEXT_PUBLIC_STORAGE_TYPE | 存储类型 | localstorage |
|
||||
| USERNAME | 管理员账号 | 空 |
|
||||
|
||||
|
||||
更多环境变量请查看 [README.md](README.md)
|
||||
|
||||
|
||||
### 🔗 相关资源
|
||||
|
||||
- [项目文档](https://github.com/senshinya/moontv#readme)
|
||||
- [问题反馈](https://github.com/senshinya/moontv/issues)
|
||||
- [功能讨论](https://github.com/senshinya/moontv/discussions)
|
||||
- [贡献指南](https://github.com/senshinya/moontv/blob/main/CONTRIBUTING.md)
|
||||
|
||||
|
||||
- [项目文档](https://github.com/katelya77/KatelyaTV#readme)
|
||||
- [问题反馈](https://github.com/katelya77/KatelyaTV/issues)
|
||||
- [功能讨论](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
- [贡献指南](https://github.com/katelya77/KatelyaTV/blob/main/CONTRIBUTING.md)
|
||||
|
||||
### 📝 更新日志
|
||||
|
||||
|
||||
查看 [CHANGELOG.md](CHANGELOG.md) 了解详细的更新历史。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**注意**: 本项目仅供学习和个人使用，请遵守当地法律法规。
|
||||
|
||||
|
||||
docker:
|
||||
needs: release
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Build and Push Docker Image
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
tags: |
|
||||
ghcr.io/senshinya/moontv:${{ github.ref_name }}
|
||||
ghcr.io/senshinya/moontv:latest
|
||||
ghcr.io/katelya77/katelyatv:${{ github.ref_name }}
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
- name: Update Release with Docker Info
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
body: |
|
||||
## 🎉 新版本发布
|
||||
|
||||
**版本号**: ${{ github.ref_name }}
|
||||
**发布日期**: ${{ github.event.head_commit.timestamp }}
|
||||
|
||||
### 🐳 Docker 镜像
|
||||
|
||||
Docker 镜像已自动构建并推送到 GitHub Container Registry：
|
||||
|
||||
```bash
|
||||
# 拉取指定版本
|
||||
docker pull ghcr.io/senshinya/moontv:${{ github.ref_name }}
|
||||
|
||||
# 拉取最新版本
|
||||
docker pull ghcr.io/senshinya/moontv:latest
|
||||
|
||||
# 运行容器
|
||||
docker run -d --name moontv -p 3000:3000 --env PASSWORD=your_password ghcr.io/senshinya/moontv:${{ github.ref_name }}
|
||||
```
|
||||
|
||||
### 🚀 其他部署方式
|
||||
|
||||
#### Vercel 部署
|
||||
- Fork 本仓库
|
||||
- 在 Vercel 中导入项目
|
||||
- 设置环境变量 PASSWORD
|
||||
- 自动部署完成
|
||||
|
||||
#### Cloudflare Pages 部署
|
||||
- Fork 本仓库
|
||||
- 在 Cloudflare Pages 中导入项目
|
||||
- 设置构建命令：`pnpm run pages:build`
|
||||
- 配置环境变量
|
||||
|
||||
### 📋 环境变量
|
||||
|
||||
| 变量 | 说明 | 默认值 |
|
||||
|------|------|--------|
|
||||
| PASSWORD | 访问密码 | 必填 |
|
||||
| NEXT_PUBLIC_STORAGE_TYPE | 存储类型 | localstorage |
|
||||
| USERNAME | 管理员账号 | 空 |
|
||||
|
||||
更多环境变量请查看 [README.md](README.md)
|
||||
|
||||
### 🔗 相关资源
|
||||
|
||||
- [项目文档](https://github.com/senshinya/moontv#readme)
|
||||
- [问题反馈](https://github.com/senshinya/moontv/issues)
|
||||
- [功能讨论](https://github.com/senshinya/moontv/discussions)
|
||||
- [贡献指南](https://github.com/senshinya/moontv/blob/main/CONTRIBUTING.md)
|
||||
|
||||
### 📝 更新日志
|
||||
|
||||
查看 [CHANGELOG.md](CHANGELOG.md) 了解详细的更新历史。
|
||||
|
||||
---
|
||||
|
||||
**注意**: 本项目仅供学习和个人使用，请遵守当地法律法规。
|
||||
update_existing_release: true
|
||||
|
||||
- name: Create Discussion
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
script: |
|
||||
const { data: discussions } = await github.rest.discussions.create({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
title: `🎉 ${context.ref_name} 版本发布讨论`,
|
||||
body: `## 🎉 ${context.ref_name} 版本发布成功！
|
||||
|
||||
新版本已成功发布，包含以下更新：
|
||||
|
||||
### 🚀 主要特性
|
||||
- 观看历史记录功能
|
||||
- 多源聚合搜索
|
||||
- PWA 支持
|
||||
- 深色模式
|
||||
- 多用户系统
|
||||
|
||||
### 🐳 Docker 部署
|
||||
\`\`\`bash
|
||||
docker pull ghcr.io/senshinya/moontv:${context.ref_name}
|
||||
docker run -d --name moontv -p 3000:3000 --env PASSWORD=your_password ghcr.io/senshinya/moontv:${context.ref_name}
|
||||
\`\`\`
|
||||
|
||||
### 📋 环境变量
|
||||
| 变量 | 说明 | 默认值 |
|
||||
|------|------|--------|
|
||||
| PASSWORD | 访问密码 | 必填 |
|
||||
| NEXT_PUBLIC_STORAGE_TYPE | 存储类型 | localstorage |
|
||||
| USERNAME | 管理员账号 | 空 |
|
||||
|
||||
### 🔗 相关链接
|
||||
- [Release 页面](https://github.com/${context.repo.owner}/${context.repo.repo}/releases/tag/${context.ref_name})
|
||||
- [项目文档](https://github.com/${context.repo.owner}/${context.repo.repo}#readme)
|
||||
- [问题反馈](https://github.com/${context.repo.owner}/${context.repo.repo}/issues)
|
||||
|
||||
---
|
||||
|
||||
欢迎在此讨论新版本的使用体验、问题反馈和功能建议！
|
||||
|
||||
**注意**: 本项目仅供学习和个人使用，请遵守当地法律法规。`,
|
||||
category: 'ANNOUNCEMENT'
|
||||
});
|
||||
|
||||
console.log(`Discussion created: ${discussions.html_url}`);
|
||||
|
||||
- name: Comment on Issues
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
script: |
|
||||
// 查找与当前版本相关的 issue
|
||||
const { data: issues } = await github.rest.issues.listForRepo({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
state: 'open',
|
||||
labels: ['enhancement', 'bug', 'feature']
|
||||
});
|
||||
|
||||
// 在相关 issue 下添加评论
|
||||
for (const issue of issues) {
|
||||
if (issue.title.toLowerCase().includes('release') ||
|
||||
issue.title.toLowerCase().includes('version') ||
|
||||
issue.body?.toLowerCase().includes('release') ||
|
||||
issue.body?.toLowerCase().includes('version')) {
|
||||
|
||||
await github.rest.issues.createComment({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: issue.number,
|
||||
body: `🎉 好消息！${context.ref_name} 版本已经发布，可能解决了您提到的问题。
|
||||
|
||||
请查看 [Release 页面](https://github.com/${context.repo.owner}/${context.repo.repo}/releases/tag/${context.ref_name}) 了解详细更新内容。
|
||||
|
||||
如果问题仍然存在，请提供更多详细信息，我们会继续关注。`
|
||||
});
|
||||
|
||||
console.log(`Commented on issue #${issue.number}`);
|
||||
}
|
||||
}
|
||||
|
||||
- name: Notify Success
|
||||
run: |
|
||||
echo "🎉 Release ${{ github.ref_name }} 发布成功！"
|
||||
echo "📦 Docker 镜像: ghcr.io/senshinya/moontv:${{ github.ref_name }}"
|
||||
echo "🔗 Release 页面: https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }}"
|
||||
echo "📝 更新日志: https://github.com/${{ github.repository }}/blob/main/CHANGELOG.md"
|
||||
|
||||
@@ -25,7 +25,7 @@ jobs:
|
||||
id: sync
|
||||
uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.1
|
||||
with:
|
||||
upstream_sync_repo: senshinya/MoonTV
|
||||
upstream_sync_repo: katelya77/KatelyaTV
|
||||
upstream_sync_branch: main
|
||||
target_sync_branch: main
|
||||
target_repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
# 更新日志 (CHANGELOG)
|
||||
|
||||
本文档记录 KatelyaTV 项目的重要更新和功能变更。
|
||||
|
||||
## [0.5.0] - 2025-09-02
|
||||
|
||||
### 🎉 新增功能
|
||||
- ⏭️ **跳过片头片尾功能**
|
||||
- 智能检测播放时间是否在跳过区间内
|
||||
- 支持手动设置片头、片尾跳过时间段
|
||||
- 播放时自动显示跳过按钮，8秒后自动隐藏
|
||||
- 每个用户可独立配置，支持跨设备同步
|
||||
- 完全兼容所有存储后端（LocalStorage、Redis、D1、Upstash）
|
||||
|
||||
### 🔧 技术改进
|
||||
- 新增 `SkipController` 组件，提供完整的跳过功能界面
|
||||
- 新增 `SkipSegment` 和 `EpisodeSkipConfig` 数据类型
|
||||
- 扩展所有存储实现以支持跳过配置 CRUD 操作
|
||||
- 新增 `/api/skip-configs` API 路由，支持服务端跳过配置管理
|
||||
- 完善的类型定义和错误处理
|
||||
|
||||
### 🌐 部署兼容性
|
||||
- ✅ **Cloudflare Pages** - Edge Runtime 完全兼容
|
||||
- ✅ **Docker 部署** - 自动 Runtime 转换，完全兼容
|
||||
- ✅ **Vercel 部署** - 自动适配，完全兼容
|
||||
- ✅ **传统服务器** - Node.js Runtime，完全兼容
|
||||
- ✅ **其他云平台** - 全面支持各种部署环境
|
||||
|
||||
### 📚 文档更新
|
||||
- 更新 README.md，添加跳过功能介绍和使用教程
|
||||
- 新增 DEPLOYMENT_COMPATIBILITY.md 部署兼容性说明
|
||||
- 添加功能特性详细描述
|
||||
- 完善环境变量和配置说明
|
||||
|
||||
### 🧪 测试验证
|
||||
- 新增 `test-docker-compatibility.js` 兼容性测试脚本
|
||||
- 验证所有 22 个 API 路由的 Edge Runtime 配置
|
||||
- 确认所有存储后端的跳过配置功能支持
|
||||
|
||||
---
|
||||
|
||||
## [0.4.0] - 之前版本
|
||||
|
||||
### 基础功能
|
||||
- 🔍 多源聚合搜索
|
||||
- 📺 高清视频播放
|
||||
- ⭐ 收藏功能
|
||||
- 📖 播放历史记录
|
||||
- 👥 多用户支持
|
||||
- 🐳 Docker 一键部署
|
||||
- ☁️ 多平台部署支持
|
||||
- 🌓 深色模式
|
||||
- 📱 PWA 支持
|
||||
|
||||
---
|
||||
|
||||
## 版本说明
|
||||
|
||||
### 版本号规则
|
||||
- **主版本号**：重大功能更新或架构变更
|
||||
- **次版本号**：新功能添加或重要改进
|
||||
- **修订版本号**：Bug 修复和小幅优化
|
||||
|
||||
### 更新类型说明
|
||||
- 🎉 **新增功能** - 全新的功能特性
|
||||
- 🔧 **技术改进** - 代码优化、性能提升、架构改进
|
||||
- 🌐 **部署兼容性** - 部署方式和环境支持
|
||||
- 📚 **文档更新** - 文档完善和说明补充
|
||||
- 🧪 **测试验证** - 测试覆盖和质量保证
|
||||
- 🐛 **Bug 修复** - 问题修复和稳定性改进
|
||||
- ⚡ **性能优化** - 响应速度和资源使用优化
|
||||
- 🎨 **界面改进** - UI/UX 优化和视觉改进
|
||||
|
||||
---
|
||||
|
||||
## 贡献指南
|
||||
|
||||
如果您想为项目贡献代码或反馈问题：
|
||||
|
||||
1. **提交 Issue** - 报告 Bug 或提出功能建议
|
||||
2. **发起 Pull Request** - 贡献代码改进
|
||||
3. **完善文档** - 帮助改进项目文档
|
||||
4. **测试反馈** - 在不同环境下测试并反馈
|
||||
|
||||
感谢所有贡献者的支持！🙏
|
||||
+101
@@ -0,0 +1,101 @@
|
||||
# D1 数据库迁移 - 添加跳过配置功能
|
||||
|
||||
如果您已经有一个运行中的 D1 数据库，需要执行以下 SQL 语句来添加跳过配置支持。
|
||||
|
||||
## 🗄️ 新增表结构
|
||||
|
||||
### skip_configs 表
|
||||
|
||||
这个表用于存储用户的跳过片头片尾配置：
|
||||
|
||||
```sql
|
||||
-- 创建跳过配置表
|
||||
CREATE TABLE IF NOT EXISTS skip_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
key TEXT NOT NULL,
|
||||
source TEXT NOT NULL,
|
||||
video_id TEXT NOT NULL,
|
||||
title TEXT NOT NULL,
|
||||
segments TEXT NOT NULL,
|
||||
updated_time INTEGER NOT NULL,
|
||||
UNIQUE(username, key)
|
||||
);
|
||||
|
||||
-- 为跳过配置添加索引以优化查询性能
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username ON skip_configs(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_key ON skip_configs(username, key);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_updated_time ON skip_configs(username, updated_time DESC);
|
||||
```
|
||||
|
||||
## 🚀 执行迁移的方法
|
||||
|
||||
### 方法一：使用 Cloudflare Dashboard（推荐）
|
||||
|
||||
1. 登录 [Cloudflare Dashboard](https://dash.cloudflare.com/)
|
||||
2. 进入您的账户，找到 **D1** 服务
|
||||
3. 选择您的数据库实例
|
||||
4. 点击 **Console** 标签页
|
||||
5. 在 SQL 查询界面中粘贴上面的 SQL 代码
|
||||
6. 点击 **Execute** 执行
|
||||
|
||||
### 方法二：使用 Wrangler CLI
|
||||
|
||||
如果您有 Wrangler CLI，可以在本地执行：
|
||||
|
||||
```bash
|
||||
# 首先登录 Cloudflare
|
||||
wrangler auth login
|
||||
|
||||
# 执行数据库迁移
|
||||
wrangler d1 execute your-database-name --file=migration.sql
|
||||
```
|
||||
|
||||
其中 `migration.sql` 包含上面的 SQL 代码。
|
||||
|
||||
### 方法三：通过 Pages 函数执行（高级）
|
||||
|
||||
也可以创建一个临时的迁移函数，部署后访问来执行迁移。
|
||||
|
||||
## 📋 字段说明
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
| -------------- | ------- | ------------------------------- |
|
||||
| `id` | INTEGER | 主键，自动递增 |
|
||||
| `username` | TEXT | 用户名，关联到用户 |
|
||||
| `key` | TEXT | 配置键，格式：`source+video_id` |
|
||||
| `source` | TEXT | 视频源标识 |
|
||||
| `video_id` | TEXT | 视频 ID |
|
||||
| `title` | TEXT | 视频标题 |
|
||||
| `segments` | TEXT | 跳过片段数据（JSON 格式） |
|
||||
| `updated_time` | INTEGER | 更新时间戳 |
|
||||
|
||||
## ✅ 迁移验证
|
||||
|
||||
执行迁移后，可以通过以下 SQL 验证表是否创建成功：
|
||||
|
||||
```sql
|
||||
-- 检查表是否存在
|
||||
SELECT name FROM sqlite_master WHERE type='table' AND name='skip_configs';
|
||||
|
||||
-- 检查表结构
|
||||
PRAGMA table_info(skip_configs);
|
||||
|
||||
-- 检查索引是否创建
|
||||
SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='skip_configs';
|
||||
```
|
||||
|
||||
## ⚠️ 重要提示
|
||||
|
||||
1. **备份数据**：执行迁移前建议备份数据库
|
||||
2. **测试环境**：建议先在测试环境执行迁移
|
||||
3. **版本兼容**：这个迁移向后兼容，不会影响现有功能
|
||||
4. **只需执行一次**：这个迁移脚本可以安全地重复执行（使用了 `IF NOT EXISTS`）
|
||||
|
||||
## 🔄 如果您是新部署
|
||||
|
||||
如果您是新部署的 D1 数据库，直接使用更新后的 `D1初始化.md` 中的完整 SQL 即可，无需单独执行迁移。
|
||||
|
||||
---
|
||||
|
||||
执行完迁移后，跳过功能就可以在您的 D1 部署中正常使用了！🎉
|
||||
@@ -49,10 +49,23 @@ CREATE TABLE IF NOT EXISTS admin_config (
|
||||
updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS skip_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
key TEXT NOT NULL,
|
||||
source TEXT NOT NULL,
|
||||
video_id TEXT NOT NULL,
|
||||
title TEXT NOT NULL,
|
||||
segments TEXT NOT NULL,
|
||||
updated_time INTEGER NOT NULL,
|
||||
UNIQUE(username, key)
|
||||
);
|
||||
|
||||
-- 基本索引
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_username ON play_records(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_favorites_username ON favorites(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_username ON search_history(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username ON skip_configs(username);
|
||||
|
||||
-- 复合索引优化查询性能
|
||||
-- 播放记录：用户名+键值的复合索引，用于快速查找特定记录
|
||||
@@ -72,4 +85,10 @@ CREATE INDEX IF NOT EXISTS idx_search_history_username_created_at ON search_hist
|
||||
|
||||
-- 搜索历史清理查询的优化索引
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_username_id_created_at ON search_history(username, id, created_at DESC);
|
||||
|
||||
-- 跳过配置索引
|
||||
-- 跳过配置：用户名+键值的复合索引，用于快速查找特定配置
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_key ON skip_configs(username, key);
|
||||
-- 跳过配置：用户名+更新时间的复合索引，用于按时间排序的查询
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_updated_time ON skip_configs(username, updated_time DESC);
|
||||
```
|
||||
|
||||
@@ -0,0 +1,226 @@
|
||||
# 🚀 部署兼容性说明
|
||||
|
||||
## 跳过片头片尾功能部署兼容性
|
||||
|
||||
我们的跳过片头片尾功能已经完全兼容各种部署方式，具体如下：
|
||||
|
||||
## 📋 功能概述
|
||||
|
||||
- ✅ **自动跳过片头片尾** - 智能检测并跳过重复内容
|
||||
- ✅ **手动配置跳过段** - 用户可自定义跳过时间段
|
||||
- ✅ **多剧集支持** - 每个剧集独立配置
|
||||
- ✅ **多存储后端** - 支持 LocalStorage、Redis、D1、Upstash
|
||||
|
||||
## 🌐 部署方式兼容性
|
||||
|
||||
### 1. Cloudflare Pages ✅
|
||||
|
||||
**Runtime**: Edge Runtime
|
||||
**配置要求**: 所有 API 路由必须使用 `export const runtime = 'edge';`
|
||||
|
||||
```typescript
|
||||
// ✅ 已正确配置
|
||||
export const runtime = 'edge';
|
||||
```
|
||||
|
||||
**特性支持**:
|
||||
|
||||
- ✅ 跳过配置 API (`/api/skip-configs`)
|
||||
- ✅ 所有存储后端（D1、Redis、Upstash）
|
||||
- ✅ 自动缓存优化
|
||||
|
||||
### 2. Docker 部署 ✅
|
||||
|
||||
**Runtime**: Node.js Runtime (自动转换)
|
||||
**自动转换**: Dockerfile 会自动将 Edge Runtime 转换为 Node.js Runtime
|
||||
|
||||
```dockerfile
|
||||
# Dockerfile 中的自动转换逻辑
|
||||
RUN find ./src -type f -name "route.ts" -print0 \
|
||||
| xargs -0 sed -i "s/export const runtime = 'edge';/export const runtime = 'nodejs';/g"
|
||||
```
|
||||
|
||||
**特性支持**:
|
||||
|
||||
- ✅ 跳过配置 API
|
||||
- ✅ 所有存储后端
|
||||
- ✅ 环境变量配置
|
||||
- ✅ 健康检查
|
||||
|
||||
### 3. Vercel 部署 ✅
|
||||
|
||||
**Runtime**: Edge Runtime / Node.js Runtime (自动检测)
|
||||
**配置**: 无需特殊配置，自动适配
|
||||
|
||||
**特性支持**:
|
||||
|
||||
- ✅ 跳过配置 API
|
||||
- ✅ 所有存储后端
|
||||
- ✅ Serverless 函数优化
|
||||
|
||||
### 4. 其他部署方式 ✅
|
||||
|
||||
**Runtime**: Node.js Runtime
|
||||
**要求**: Node.js 18+ 环境
|
||||
|
||||
**支持的部署方式**:
|
||||
|
||||
- ✅ 传统服务器部署
|
||||
- ✅ PM2 进程管理
|
||||
- ✅ Nginx 反向代理
|
||||
- ✅ Kubernetes
|
||||
- ✅ Railway、Render 等云平台
|
||||
|
||||
## 🗄️ 存储后端支持
|
||||
|
||||
### LocalStorage (默认)
|
||||
|
||||
```bash
|
||||
# 无需额外配置，适用于单机部署
|
||||
NEXT_PUBLIC_STORAGE_TYPE=localstorage
|
||||
```
|
||||
|
||||
### Redis
|
||||
|
||||
```bash
|
||||
# 高性能缓存存储
|
||||
NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
REDIS_URL=redis://localhost:6379
|
||||
```
|
||||
|
||||
### Cloudflare D1
|
||||
|
||||
```bash
|
||||
# Cloudflare 原生数据库
|
||||
NEXT_PUBLIC_STORAGE_TYPE=d1
|
||||
```
|
||||
|
||||
### Upstash Redis
|
||||
|
||||
```bash
|
||||
# 无服务器 Redis
|
||||
NEXT_PUBLIC_STORAGE_TYPE=upstash
|
||||
UPSTASH_REDIS_REST_URL=https://xxx.upstash.io
|
||||
UPSTASH_REDIS_REST_TOKEN=xxx
|
||||
```
|
||||
|
||||
## 🔧 环境变量配置
|
||||
|
||||
### 核心配置
|
||||
|
||||
```bash
|
||||
# 存储类型 (必需)
|
||||
NEXT_PUBLIC_STORAGE_TYPE=localstorage|redis|d1|upstash
|
||||
|
||||
# Docker 环境标识 (Docker 部署时自动设置)
|
||||
DOCKER_ENV=true
|
||||
```
|
||||
|
||||
### 存储特定配置
|
||||
|
||||
```bash
|
||||
# Redis
|
||||
REDIS_URL=redis://localhost:6379
|
||||
REDIS_PASSWORD=optional
|
||||
|
||||
# Upstash
|
||||
UPSTASH_REDIS_REST_URL=https://xxx.upstash.io
|
||||
UPSTASH_REDIS_REST_TOKEN=xxx
|
||||
|
||||
# D1 (Cloudflare 自动注入)
|
||||
# 无需手动配置
|
||||
```
|
||||
|
||||
## 🚀 快速部署指南
|
||||
|
||||
### Cloudflare Pages
|
||||
|
||||
1. 连接 GitHub 仓库
|
||||
2. 设置构建命令: `npm run build`
|
||||
3. 设置输出目录: `.next`
|
||||
4. 配置环境变量 (可选)
|
||||
|
||||
### Docker
|
||||
|
||||
```bash
|
||||
# 构建镜像
|
||||
docker build -t katelyatv .
|
||||
|
||||
# 运行容器
|
||||
docker run -p 3000:3000 \
|
||||
-e NEXT_PUBLIC_STORAGE_TYPE=localstorage \
|
||||
katelyatv
|
||||
```
|
||||
|
||||
### Vercel
|
||||
|
||||
```bash
|
||||
# 一键部署
|
||||
npx vercel
|
||||
|
||||
# 或使用 Vercel CLI
|
||||
vercel --prod
|
||||
```
|
||||
|
||||
## 🧪 兼容性测试
|
||||
|
||||
运行兼容性测试脚本：
|
||||
|
||||
```bash
|
||||
# 测试所有部署方式的兼容性
|
||||
node scripts/test-docker-compatibility.js
|
||||
```
|
||||
|
||||
## ⚠️ 注意事项
|
||||
|
||||
1. **Edge Runtime 限制**: 在 Cloudflare Pages 上，所有 API 路由必须使用 Edge Runtime
|
||||
2. **存储选择**: 根据部署环境选择合适的存储后端
|
||||
3. **环境变量**: 确保在生产环境中正确配置存储相关环境变量
|
||||
4. **缓存策略**: LocalStorage 仅适用于单机部署，集群部署请使用 Redis
|
||||
|
||||
## 📊 性能建议
|
||||
|
||||
### 小型部署 (< 1000 用户)
|
||||
|
||||
- **推荐**: LocalStorage
|
||||
- **优点**: 零配置，性能良好
|
||||
- **缺点**: 仅支持单机
|
||||
|
||||
### 中型部署 (1000-10000 用户)
|
||||
|
||||
- **推荐**: Redis
|
||||
- **优点**: 高性能，支持集群
|
||||
- **缺点**: 需要 Redis 服务器
|
||||
|
||||
### 大型部署 (> 10000 用户)
|
||||
|
||||
- **推荐**: Cloudflare D1 + Redis 缓存
|
||||
- **优点**: 高可用，全球分布
|
||||
- **缺点**: 依赖 Cloudflare
|
||||
|
||||
## 🆘 故障排除
|
||||
|
||||
### 常见问题
|
||||
|
||||
1. **API 路由 404**
|
||||
|
||||
- 检查 Edge Runtime 配置
|
||||
- 确认部署环境支持
|
||||
|
||||
2. **跳过配置保存失败**
|
||||
|
||||
- 检查存储后端配置
|
||||
- 验证环境变量设置
|
||||
|
||||
3. **Docker 构建失败**
|
||||
|
||||
- 确认 Node.js 版本 ≥ 18
|
||||
- 检查 pnpm 安装
|
||||
|
||||
4. **Cloudflare Pages 部署失败**
|
||||
- 确认所有 API 路由有 Edge Runtime 配置
|
||||
- 检查构建命令和输出目录
|
||||
|
||||
---
|
||||
|
||||
🎉 **恭喜！** 您的跳过片头片尾功能已完全兼容所有主流部署方式！
|
||||
@@ -1,215 +1,476 @@
|
||||
# KatelyaTV
|
||||
|
||||
<div align="center">
|
||||
<img src="public/logo.png" alt="KatelyaTV Logo" width="120">
|
||||
<img src="public/logo.png" alt="KatelyaTV Logo" width="128" />
|
||||
|
||||
<h1>KatelyaTV</h1>
|
||||
<p><strong>跨平台 · 聚合搜索 · 即开即用 · 自托管影视聚合播放器</strong></p>
|
||||
<p>基于 <code>Next.js 14</code> · <code>TypeScript</code> · <code>Tailwind CSS</code> · 多源聚合 / 播放记录 / 收藏同步 / 跳过片头片尾 / PWA</p>
|
||||
<p>MoonTV 二创延续版 · 持续维护与增强</p>
|
||||
|
||||
<p>
|
||||
<a href="#部署">🚀 部署</a> ·
|
||||
<a href="#功能特性">✨ 功能</a> ·
|
||||
<a href="#docker">🐳 Docker</a> ·
|
||||
<a href="#环境变量">⚙️ 配置</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
> 🎬 **KatelyaTV** 是一个开箱即用的、跨平台的影视聚合播放器。它基于 **Next.js 14** + **Tailwind CSS** + **TypeScript** 构建，支持多资源搜索、在线播放、收藏同步、播放记录、本地/云端存储，让你可以随时随地畅享海量免费影视内容。
|
||||
>
|
||||
> 本项目是在原始项目「MoonTV」基础上的二创与继承版本，由 Katelya 持续开发与维护。在致敬原作的前提下，继续修复问题、优化体验并扩展功能。
|
||||
## 📰 项目来源与声明
|
||||
|
||||
<div align="center">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
## 📋 重要声明
|
||||
|
||||
> ⚠️ **视频源说明**
|
||||
>
|
||||
> 应用户建议，为避免潜在的版权争议，本项目已移除内置的视频源配置。如需使用完整功能，请：
|
||||
> - 📥 [下载官方提供的视频源配置文件](https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file)
|
||||
> - 🔍 自行寻找符合当地法律法规的合规视频源
|
||||
> - 🛠️ 根据需要自定义配置文件
|
||||
>
|
||||
> 项目本身仅提供技术框架，内容源由用户自主选择和配置。请确保您的使用行为符合相关法律法规。
|
||||
|
||||
---
|
||||
|
||||
## 📸 Screenshot
|
||||
|
||||
<div align="center">
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td><img src="public/screenshot1.png" alt="KatelyaTV 截图1" width="400"></td>
|
||||
<td><img src="public/screenshot2.png" alt="KatelyaTV 截图2" width="400"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="public/screenshot3.png" alt="KatelyaTV 截图3" width="400"></td>
|
||||
<td><img src="public/screenshot4.png" alt="KatelyaTV 截图4" width="400"></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
本项目自「MoonTV」演进而来，为其二创/继承版本，持续维护与改进功能与体验。保留并致谢原作者与社区贡献者；如有授权或版权问题请联系以处理。目标：在原作基础上提供更易部署、更友好、更稳定的体验。
|
||||
|
||||
## ✨ 功能特性
|
||||
|
||||
- 🔍 **多源聚合搜索**：内置20+个免费资源站点，一次搜索立刻返回全源结果，支持电影、电视剧、综艺等多种类型。
|
||||
- 📄 **丰富详情页**：支持剧集列表、演员、年份、简介等完整信息展示，集成豆瓣评分和热门推荐。
|
||||
- ▶️ **流畅在线播放**：集成 HLS.js & ArtPlayer，支持多种视频格式，自动跳过广告切片。
|
||||
- 📺 **观看历史记录**：智能记录播放进度，支持断点续播，多设备同步观看状态。
|
||||
- ❤️ **收藏 + 继续观看**：支持 Redis/D1/Upstash 存储，多端同步进度，个性化推荐。
|
||||
- 📱 **PWA 支持**：离线缓存、安装到桌面/主屏，移动端原生体验，支持推送通知。
|
||||
- 🌗 **响应式布局**：桌面侧边栏 + 移动底部导航，自适应各种屏幕尺寸，支持深色模式。
|
||||
- 👥 **多用户系统**：支持用户注册、登录、权限管理，数据隔离和同步。
|
||||
- 🚀 **极简部署**：一条 Docker 命令即可将完整服务跑起来，或免费部署到 Vercel 和 Cloudflare。
|
||||
- 🎨 **现代化UI**：基于 Tailwind CSS 构建，支持主题切换，流畅的动画效果。
|
||||
### 🎬 核心播放功能
|
||||
|
||||
<details>
|
||||
<summary>点击查看项目截图</summary>
|
||||
<img src="public/screenshot1.png" alt="项目截图" style="max-width:600px">
|
||||
<img src="public/screenshot2.png" alt="项目截图" style="max-width:600px">
|
||||
<img src="public/screenshot3.png" alt="项目截图" style="max-width:600px">
|
||||
</details>
|
||||
- **🔍 聚合搜索**：整合多个影视资源站，一键搜索全网内容
|
||||
- **📺 高清播放**：基于 ArtPlayer 的强大播放器，支持多种格式和画质
|
||||
- **⏭️ 智能跳过**：自动检测并跳过片头片尾，手动设置跳过时间段
|
||||
- **🎯 断点续播**：自动记录播放进度，跨设备同步观看位置
|
||||
- **📱 响应式设计**：完美适配手机、平板、电脑各种屏幕尺寸
|
||||
|
||||
## 🗺 目录
|
||||
### 💾 数据管理
|
||||
|
||||
- [技术栈](#技术栈)
|
||||
- [核心功能](#核心功能)
|
||||
- [项目来源与声明](#项目来源与声明)
|
||||
- [部署](#部署)
|
||||
- [Docker 部署详解](#Docker-部署详解)
|
||||
- [Docker Compose 最佳实践](#Docker-Compose-最佳实践)
|
||||
- [环境变量](#环境变量)
|
||||
- [配置说明](#配置说明)
|
||||
- [管理员配置](#管理员配置)
|
||||
- [AndroidTV 使用](#AndroidTV-使用)
|
||||
- [Roadmap](#roadmap)
|
||||
- [安全与隐私提醒](#安全与隐私提醒)
|
||||
- [License](#license)
|
||||
- [致谢](#致谢)
|
||||
- **⭐ 收藏功能**：收藏喜欢的影视作品，支持跨设备同步
|
||||
- **📖 播放历史**：自动记录观看历史，快速找回看过的内容
|
||||
- **👥 多用户支持**：独立的用户系统，每个用户独享个人数据
|
||||
- **🔄 数据同步**：支持多种存储后端（LocalStorage、Redis、D1、Upstash）
|
||||
|
||||
## 🛠 技术栈
|
||||
### 🚀 部署与扩展
|
||||
|
||||
- **🐳 Docker 一键部署**：提供完整的 Docker 镜像，开箱即用
|
||||
- **☁️ 多平台支持**：Vercel、Cloudflare Pages、传统服务器全兼容
|
||||
- **🔧 灵活配置**：支持自定义资源站、代理设置、主题配置
|
||||
- **📱 PWA 支持**：可安装为桌面/手机应用，离线缓存
|
||||
|
||||
### 🎨 用户体验
|
||||
|
||||
- **🌓 深色模式**：支持明暗主题切换，护眼舒适
|
||||
- **⚡ 性能优化**：智能缓存、懒加载、播放源优选算法
|
||||
- **🔐 隐私保护**：本地部署，数据完全掌控
|
||||
- **🌍 国际化**：多语言支持（规划中）
|
||||
|
||||
## 📋 技术栈
|
||||
|
||||
| 分类 | 主要依赖 |
|
||||
| --------- | ----------------------------------------------------------------------------------------------------- |
|
||||
| 前端框架 | [Next.js 14](https://nextjs.org/) · App Router |
|
||||
| UI & 样式 | [Tailwind CSS 3](https://tailwindcss.com/) · [Framer Motion](https://www.framer.com/motion/) |
|
||||
| 语言 | TypeScript 4 |
|
||||
| 语言 | TypeScript 5 |
|
||||
| 播放器 | [ArtPlayer](https://github.com/zhw2590582/ArtPlayer) · [HLS.js](https://github.com/video-dev/hls.js/) |
|
||||
| 状态管理 | React Hooks · Context API |
|
||||
| 代码质量 | ESLint · Prettier · Jest · Husky |
|
||||
| 部署 | Docker · Vercel · CloudFlare pages |
|
||||
|
||||
## 🎯 核心功能
|
||||
## 🚀 部署教程
|
||||
|
||||
### 观看历史记录
|
||||
> **💡 推荐方案**：新手优先选择 **Docker 单容器**（最简单），需要多用户再升级到 **Docker + Redis**
|
||||
|
||||
- **智能进度记录**：自动记录每个视频的播放进度、观看时长、当前集数
|
||||
- **断点续播**：支持从上次观看位置继续播放，无需手动寻找
|
||||
- **多设备同步**：通过 Redis/D1/Upstash 存储，实现跨设备观看记录同步
|
||||
- **历史管理**：支持查看、删除单条记录或清空全部历史
|
||||
- **进度条显示**：在视频卡片上显示观看进度百分比
|
||||
### 📋 部署方式对比
|
||||
|
||||
### 多源聚合搜索
|
||||
| 方式 | 难度 | 成本 | 多用户 | 推荐场景 |
|
||||
| --------------------- | ------ | -------- | ------ | ------------------- |
|
||||
| 🐳 **Docker 单容器** | ⭐ | 需服务器 | ❌ | 个人使用，最简单 |
|
||||
| 🐳 **Docker + Redis** | ⭐⭐ | 需服务器 | ✅ | 家庭/团队，功能完整 |
|
||||
| ☁️ **Vercel** | ⭐ | 免费 | ❌ | 临时体验，无服务器 |
|
||||
| 🌐 **Cloudflare** | ⭐⭐⭐ | 免费 | ✅ | 技术爱好者 |
|
||||
|
||||
- **20+ 资源站点**：集成电影天堂、黑木耳、如意资源等热门站点
|
||||
- **统一搜索接口**：一次搜索返回多个源的结果，提高资源获取成功率
|
||||
- **智能去重**：自动识别重复内容，优化搜索结果展示
|
||||
- **分类筛选**：支持按电影、电视剧、综艺等类型筛选
|
||||
---
|
||||
|
||||
### 收藏与同步
|
||||
## 🎯 方案一：Docker 单容器（推荐新手）
|
||||
|
||||
- **个性化收藏**：支持收藏喜欢的影视作品，创建个人片单
|
||||
- **多端同步**：收藏数据云端存储，多设备访问保持一致
|
||||
- **观看状态**：收藏夹中显示观看进度和当前集数
|
||||
- **批量管理**：支持批量删除和清空收藏
|
||||
> **适合场景**：个人使用，有服务器/NAS/电脑，想要最简单的部署方式
|
||||
|
||||
### PWA 特性
|
||||
### 🔧 前置要求
|
||||
|
||||
- **离线缓存**：支持离线访问已缓存的内容
|
||||
- **桌面安装**：可安装到桌面，提供原生应用体验
|
||||
- **推送通知**：支持新内容推送和更新提醒
|
||||
- **响应式设计**：完美适配各种屏幕尺寸
|
||||
- 一台能联网的设备（服务器/NAS/Windows/Mac/Linux 都行）
|
||||
- 已安装 Docker（[Docker 官网下载](https://www.docker.com/get-started/)）
|
||||
|
||||
## 📢 项目来源与声明
|
||||
### 📝 详细步骤
|
||||
|
||||
- 本项目自「MoonTV」演进而来，为其二创/继承版本，持续维护与改进功能与体验。
|
||||
- 代码中保留并致谢原有作者与社区贡献者；如有授权或版权问题，请与我们联系以尽快处理。
|
||||
- KatelyaTV 致力于在原作优秀基础上，提供更易部署、更友好、更稳定的使用体验。
|
||||
#### 第一步：拉取镜像
|
||||
|
||||
## 🚀 部署
|
||||
```bash
|
||||
# 下载最新版本镜像（支持 ARM 和 x86 架构）
|
||||
docker pull ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
本项目**支持 Vercel、Docker 和 Cloudflare** 部署。
|
||||
#### 第二步：启动容器
|
||||
|
||||
### 存储支持矩阵
|
||||
```bash
|
||||
# 一键启动（请把 your_password 改成你的密码）
|
||||
docker run -d \
|
||||
--name katelyatv \
|
||||
-p 3000:3000 \
|
||||
--env PASSWORD=your_password \
|
||||
--restart unless-stopped \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
| | Docker | Vercel | Cloudflare |
|
||||
| :-----------: | :----: | :----: | :--------: |
|
||||
| localstorage | ✅ | ✅ | ✅ |
|
||||
| 原生 redis | ✅ | | |
|
||||
| Cloudflare D1 | | | ✅ |
|
||||
| Upstash Redis | ☑️ | ✅ | ☑️ |
|
||||
> **Windows 用户注意**：在 PowerShell 中运行上述命令
|
||||
|
||||
✅：经测试支持
|
||||
☑️：理论上支持，未测试
|
||||
#### 第三步：访问应用
|
||||
|
||||
除 localstorage 方式外，其他方式都支持多账户、记录同步和管理页面
|
||||
1. 打开浏览器，访问：`http://你的服务器IP:3000`
|
||||
2. 如果是本机安装，访问：`http://localhost:3000`
|
||||
3. 输入你在第二步设置的密码即可进入
|
||||
|
||||
### Vercel 部署
|
||||
#### 第四步：自定义资源站（可选）
|
||||
|
||||
#### 普通部署（localstorage）
|
||||
如果你有自己的资源站配置，可以挂载 `config.json` 文件：
|
||||
|
||||
1. **Fork** 本仓库到你的 GitHub 账户。
|
||||
2. 登陆 [Vercel](https://vercel.com/)，点击 **Add New → Project**，选择 Fork 后的仓库。
|
||||
3. 设置 PASSWORD 环境变量。
|
||||
4. 保持默认设置完成首次部署。
|
||||
5. 如需自定义 `config.json`，请直接修改 Fork 后仓库中该文件。
|
||||
6. 每次 Push 到 `main` 分支将自动触发重新构建。
|
||||
```bash
|
||||
# 先停止并删除旧容器
|
||||
docker stop katelyatv && docker rm katelyatv
|
||||
|
||||
部署完成后即可通过分配的域名访问，也可以绑定自定义域名。
|
||||
# 重新运行并挂载配置文件
|
||||
docker run -d \
|
||||
--name katelyatv \
|
||||
-p 3000:3000 \
|
||||
--env PASSWORD=your_password \
|
||||
-v /path/to/your/config.json:/app/config.json:ro \
|
||||
--restart unless-stopped \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
#### Upstash Redis 支持
|
||||
> **路径说明**：把 `/path/to/your/config.json` 替换成你的配置文件完整路径
|
||||
> **Windows 示例**：`-v C:/Users/你的用户名/Desktop/config.json:/app/config.json:ro`
|
||||
|
||||
0. 完成普通部署并成功访问。
|
||||
1. 在 [upstash](https://upstash.com/) 注册账号并新建一个 Redis 实例，名称任意。
|
||||
2. 复制新数据库的 **HTTPS ENDPOINT 和 TOKEN**
|
||||
3. 返回你的 Vercel 项目，新增环境变量 **UPSTASH_URL 和 UPSTASH_TOKEN**，值为第二步复制的 endpoint 和 token
|
||||
4. 设置环境变量 NEXT_PUBLIC_STORAGE_TYPE，值为 **upstash**；设置 USERNAME 和 PASSWORD 作为站长账号
|
||||
5. 重试部署
|
||||
### 🛠️ 常用管理命令
|
||||
|
||||
### Cloudflare 部署
|
||||
```bash
|
||||
# 查看运行状态
|
||||
docker ps
|
||||
|
||||
**Cloudflare Pages 的环境变量尽量设置为密钥而非文本**
|
||||
# 查看日志
|
||||
docker logs katelyatv
|
||||
|
||||
#### 普通部署（localstorage）
|
||||
# 重启应用
|
||||
docker restart katelyatv
|
||||
|
||||
1. **Fork** 本仓库到你的 GitHub 账户。
|
||||
2. 登陆 [Cloudflare](https://cloudflare.com)，点击 **计算（Workers）-> Workers 和 Pages**，点击创建
|
||||
3. 选择 Pages，导入现有的 Git 存储库，选择 Fork 后的仓库
|
||||
4. 构建命令填写 **pnpm install --frozen-lockfile && pnpm run pages:build**，预设框架为无，构建输出目录为 `.vercel/output/static`
|
||||
5. 保持默认设置完成首次部署。进入设置，将兼容性标志设置为 `nodejs_compat`
|
||||
6. 首次部署完成后进入设置，新增 PASSWORD 密钥（变量和机密下），而后重试部署。
|
||||
7. 如需自定义 `config.json`，请直接修改 Fork 后仓库中该文件。
|
||||
8. 每次 Push 到 `main` 分支将自动触发重新构建。
|
||||
# 停止应用
|
||||
docker stop katelyatv
|
||||
|
||||
#### D1 支持
|
||||
# 删除容器
|
||||
docker rm katelyatv
|
||||
```
|
||||
|
||||
0. 完成普通部署并成功访问
|
||||
1. 点击 **存储和数据库 -> D1 SQL 数据库**，创建一个新的数据库，名称随意
|
||||
2. 进入刚创建的数据库，点击左上角的 Explore Data，将[D1 初始化](D1初始化.md) 中的内容粘贴到 Query 窗口后点击 **Run All**，等待运行完成
|
||||
3. 返回你的 pages 项目，进入 **设置 -> 绑定**，添加绑定 D1 数据库，选择你刚创建的数据库，变量名称填 **DB**
|
||||
4. 设置环境变量 NEXT_PUBLIC_STORAGE_TYPE，值为 **d1**；设置 USERNAME 和 PASSWORD 作为站长账号
|
||||
5. 重试部署
|
||||
---
|
||||
|
||||
## 🐳 Docker 部署详解
|
||||
## 🎯 方案二：Docker + Redis（推荐进阶）
|
||||
|
||||
Docker 是推荐的部署方式，提供完整的环境隔离和便捷的管理体验。我们的镜像支持多架构（`linux/amd64`、`linux/arm64`），确保在各种硬件平台上都能稳定运行。
|
||||
> **适合场景**：多人使用，需要账号系统、观看记录同步、收藏功能
|
||||
|
||||
### 🔧 前置要求
|
||||
|
||||
- 已完成方案一，确认单容器版本能正常运行
|
||||
- 了解基本的 Docker Compose 概念
|
||||
|
||||
### 📝 详细步骤
|
||||
|
||||
#### 第一步：创建配置文件
|
||||
|
||||
在你的服务器上创建一个文件夹，比如 `/opt/katelyatv`：
|
||||
|
||||
```bash
|
||||
# 创建目录
|
||||
mkdir -p /opt/katelyatv
|
||||
cd /opt/katelyatv
|
||||
|
||||
# 创建 docker-compose.yml 文件
|
||||
cat > docker-compose.yml << 'EOF'
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
# KatelyaTV 主应用
|
||||
katelyatv:
|
||||
image: ghcr.io/katelya77/katelyatv:latest
|
||||
container_name: katelyatv
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
# 管理员账号（请修改）
|
||||
- USERNAME=admin
|
||||
- PASSWORD=your_strong_password
|
||||
# 启用 Redis 存储
|
||||
- NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
- REDIS_URL=redis://katelyatv-redis:6379
|
||||
# 允许用户注册（可选）
|
||||
- NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
depends_on:
|
||||
katelyatv-redis:
|
||||
condition: service_healthy
|
||||
restart: unless-stopped
|
||||
# 可选：挂载自定义配置
|
||||
# volumes:
|
||||
# - ./config.json:/app/config.json:ro
|
||||
|
||||
# Redis 数据库
|
||||
katelyatv-redis:
|
||||
image: redis:7-alpine
|
||||
container_name: katelyatv-redis
|
||||
command: redis-server --appendonly yes --maxmemory 256mb --maxmemory-policy allkeys-lru
|
||||
volumes:
|
||||
- katelyatv-redis-data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
katelyatv-redis-data:
|
||||
EOF
|
||||
```
|
||||
|
||||
#### 第二步：修改配置
|
||||
|
||||
编辑 `docker-compose.yml` 文件，**必须修改**以下内容：
|
||||
|
||||
- `PASSWORD=your_strong_password` 改成你的强密码
|
||||
- `USERNAME=admin` 可以改成你喜欢的管理员用户名
|
||||
|
||||
#### 第三步：启动服务
|
||||
|
||||
```bash
|
||||
# 启动所有服务
|
||||
docker compose up -d
|
||||
|
||||
# 查看启动状态
|
||||
docker compose ps
|
||||
```
|
||||
|
||||
#### 第四步：验证部署
|
||||
|
||||
1. 访问 `http://你的服务器IP:3000`
|
||||
2. 使用你设置的用户名和密码登录
|
||||
3. 登录后访问 `http://你的服务器IP:3000/admin` 进入管理后台
|
||||
4. 在管理后台可以配置资源站、管理用户等
|
||||
|
||||
### 🛠️ 管理命令
|
||||
|
||||
```bash
|
||||
# 查看所有服务状态
|
||||
docker compose ps
|
||||
|
||||
# 查看日志
|
||||
docker compose logs -f
|
||||
|
||||
# 重启所有服务
|
||||
docker compose restart
|
||||
|
||||
# 停止所有服务
|
||||
docker compose down
|
||||
|
||||
# 更新到最新版本
|
||||
docker compose pull
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
### 💾 备份数据
|
||||
|
||||
```bash
|
||||
# 备份 Redis 数据
|
||||
docker run --rm -v katelyatv-redis-data:/data -v $(pwd):/backup alpine tar czf /backup/redis-backup-$(date +%Y%m%d).tar.gz /data
|
||||
|
||||
# 恢复数据（如果需要）
|
||||
docker run --rm -v katelyatv-redis-data:/data -v $(pwd):/backup alpine tar xzf /backup/redis-backup-20241201.tar.gz -C /
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 方案三：Vercel 部署（免服务器）
|
||||
|
||||
> **适合场景**：没有服务器，想要快速体验，个人使用
|
||||
|
||||
### 🔧 前置要求
|
||||
|
||||
- GitHub 账号
|
||||
- Vercel 账号（可用 GitHub 登录）
|
||||
|
||||
### 📝 详细步骤
|
||||
|
||||
#### 第一步：Fork 仓库
|
||||
|
||||
1. 打开 [KatelyaTV GitHub 页面](https://github.com/katelya77/KatelyaTV)
|
||||
2. 点击右上角 **Fork** 按钮
|
||||
3. 等待 Fork 完成
|
||||
|
||||
#### 第二步：部署到 Vercel
|
||||
|
||||
1. 访问 [Vercel](https://vercel.com/)，用 GitHub 账号登录
|
||||
2. 点击 **Add New... → Project**
|
||||
3. 找到你刚才 Fork 的 `KatelyaTV` 仓库，点击 **Import**
|
||||
4. 在 **Environment Variables** 部分添加：
|
||||
- Key: `PASSWORD`
|
||||
- Value: `你的访问密码`（这是进入网站的密码）
|
||||
5. 点击 **Deploy** 开始部署
|
||||
|
||||
#### 第三步：等待部署完成
|
||||
|
||||
- 通常需要 2-3 分钟
|
||||
- 部署成功后会显示域名，比如 `https://your-project.vercel.app`
|
||||
|
||||
#### 第四步：访问和使用
|
||||
|
||||
1. 点击 Vercel 提供的域名链接
|
||||
2. 输入你在第二步设置的密码
|
||||
3. 开始使用！
|
||||
|
||||
### 🔧 自定义资源站
|
||||
|
||||
如果你想添加自己的资源站：
|
||||
|
||||
1. 在你 Fork 的仓库中找到 `config.json` 文件
|
||||
2. 点击编辑按钮（铅笔图标）
|
||||
3. 修改配置内容
|
||||
4. 点击 **Commit changes**
|
||||
5. Vercel 会自动重新部署
|
||||
|
||||
### ⚠️ 注意事项
|
||||
|
||||
- Vercel 版本不支持用户注册和账号系统
|
||||
- 观看记录保存在浏览器本地，换设备会丢失
|
||||
- 如果需要多用户功能，请考虑 Docker + Redis 方案
|
||||
|
||||
---
|
||||
|
||||
## 🎯 方案四：Cloudflare Pages（进阶用户）
|
||||
|
||||
> **适合场景**：技术爱好者，想要全球 CDN 加速，免费但配置复杂
|
||||
|
||||
### 🔧 前置要求
|
||||
|
||||
- GitHub 账号
|
||||
- Cloudflare 账号
|
||||
- 对前端构建有基本了解
|
||||
|
||||
### 📝 详细步骤
|
||||
|
||||
#### 第一步：Fork 仓库并连接
|
||||
|
||||
1. Fork [KatelyaTV 仓库](https://github.com/katelya77/KatelyaTV)
|
||||
2. 登录 [Cloudflare](https://cloudflare.com)
|
||||
3. 进入 **Workers 和 Pages** → 点击 **创建应用程序**
|
||||
4. 选择 **Pages** → **连接到 Git**
|
||||
5. 选择你 Fork 的仓库
|
||||
|
||||
#### 第二步：配置构建设置
|
||||
|
||||
在构建设置页面填写：
|
||||
|
||||
- **构建命令**: `pnpm install && pnpm pages:build`
|
||||
- **构建输出目录**: `.vercel/output/static`
|
||||
- **Root directory**: `./`（默认）
|
||||
- **Node.js 版本**: `18`（推荐）
|
||||
|
||||
#### 第三步：设置兼容性
|
||||
|
||||
1. 点击 **保存并部署**
|
||||
2. 等待首次构建完成（可能会失败，没关系）
|
||||
3. 进入项目 **设置** → **兼容性标志**
|
||||
4. 添加标志: `nodejs_compat`
|
||||
|
||||
#### 第四步：添加环境变量
|
||||
|
||||
在 **设置** → **环境变量** 中添加：
|
||||
|
||||
- `PASSWORD`: 你的访问密码
|
||||
|
||||
#### 第五步：重新部署
|
||||
|
||||
1. 进入 **部署** 页面
|
||||
2. 点击最新部署旁的 **...** → **重试部署**
|
||||
3. 等待部署成功
|
||||
|
||||
### 🗄️ 启用 D1 数据库（可选，支持多用户）
|
||||
|
||||
如果你想要用户系统和数据同步：
|
||||
|
||||
> ⚠️ **升级提醒**：如果你已有 D1 数据库，需要手动添加新功能表。请查看 [D1_MIGRATION.md](./D1_MIGRATION.md) 文件。
|
||||
|
||||
#### 第一步：创建 D1 数据库
|
||||
|
||||
1. 在 Cloudflare Dashboard 进入 **存储和数据库** → **D1 SQL 数据库**
|
||||
2. 点击 **创建数据库**，名称随意（比如 `katelyatv-db`）
|
||||
|
||||
#### 第二步：初始化数据库
|
||||
|
||||
1. 进入刚创建的数据库
|
||||
2. 点击 **Explore Data**
|
||||
3. 打开项目中的 [D1 初始化.md](https://github.com/katelya77/KatelyaTV/blob/main/D1%E5%88%9D%E5%A7%8B%E5%8C%96.md) 文件，复制所有 SQL 语句
|
||||
4. 粘贴到查询窗口，点击 **Run All**
|
||||
|
||||
#### 第三步：绑定数据库
|
||||
|
||||
1. 回到 Pages 项目设置
|
||||
2. 进入 **绑定** → **添加绑定**
|
||||
3. 选择 **D1 数据库**
|
||||
4. 变量名: `DB`
|
||||
5. 选择你刚创建的数据库
|
||||
|
||||
#### 第四步：添加环境变量
|
||||
|
||||
在环境变量中追加：
|
||||
|
||||
- `NEXT_PUBLIC_STORAGE_TYPE`: `d1`
|
||||
- `USERNAME`: 管理员用户名
|
||||
- `PASSWORD`: 管理员密码
|
||||
|
||||
#### 第五步：重新部署
|
||||
|
||||
重新部署后，你就可以：
|
||||
|
||||
- 使用管理员账号登录
|
||||
- 访问 `/admin` 管理后台
|
||||
- 支持用户注册和数据同步
|
||||
|
||||
---
|
||||
|
||||
## 🆙 升级和维护
|
||||
|
||||
### Docker 升级
|
||||
|
||||
```bash
|
||||
# 单容器版本
|
||||
docker stop katelyatv
|
||||
docker rm katelyatv
|
||||
docker pull ghcr.io/katelya77/katelyatv:latest
|
||||
# 然后重新运行启动命令
|
||||
|
||||
# Compose 版本
|
||||
docker compose pull
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
### Vercel 升级
|
||||
|
||||
- 自动升级：当原仓库更新时，你的 Fork 仓库会收到更新提示
|
||||
- 手动升级：在你的 Fork 仓库点击 **Sync fork** 按钮
|
||||
|
||||
### Cloudflare 升级
|
||||
|
||||
- 同 Vercel，通过 Git 同步自动触发重新构建
|
||||
|
||||
### 🚨 常见问题排查
|
||||
|
||||
| 问题 | 现象 | 解决方法 |
|
||||
| --------------- | -------------------------- | ---------------------------------- |
|
||||
| 无法访问 | 浏览器显示无法连接 | 检查端口 3000 是否开放，防火墙设置 |
|
||||
| 403 Forbidden | 显示访问被拒绝 | 检查 PASSWORD 环境变量是否设置正确 |
|
||||
| Docker 启动失败 | 容器无法启动 | 查看日志 `docker logs katelyatv` |
|
||||
| Redis 连接失败 | 无法登录或保存数据 | 检查 Redis 容器是否正常运行 |
|
||||
| 构建失败 | Vercel/Cloudflare 部署失败 | 查看构建日志，检查环境变量设置 |
|
||||
|
||||
需要帮助？可以在 [GitHub Issues](https://github.com/katelya77/KatelyaTV/issues) 提问。
|
||||
|
||||
## 🐳 Docker
|
||||
|
||||
推荐方式。镜像多架构 (`linux/amd64`,`linux/arm64`)，基于 Alpine，体积小启动快。
|
||||
|
||||
### 🚀 快速开始
|
||||
|
||||
#### 1. 基础部署（最简单）
|
||||
#### 1. 基础部署（LocalStorage，最快验证）
|
||||
|
||||
```bash
|
||||
# 拉取最新镜像（支持 amd64/arm64 多架构）
|
||||
@@ -226,7 +487,9 @@ docker run -d \
|
||||
|
||||
访问 `http://服务器IP:3000` 即可使用。（需要在服务器控制台开放 3000 端口）
|
||||
|
||||
#### 2. 带自定义配置的部署
|
||||
> Windows 本地构建如遇 Node Standalone `EPERM symlink`：优先使用 **Docker 镜像** 或在 **WSL2** 环境构建；无需修改源码。
|
||||
|
||||
#### 2. 自定义配置（挂载 config.json）
|
||||
|
||||
```bash
|
||||
# 创建配置文件目录
|
||||
@@ -242,7 +505,7 @@ docker run -d \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
#### 3. 查看运行状态
|
||||
#### 3. 常用运维命令
|
||||
|
||||
```bash
|
||||
# 查看容器状态
|
||||
@@ -255,7 +518,7 @@ docker logs katelyatv
|
||||
docker logs -f katelyatv
|
||||
```
|
||||
|
||||
#### 4. 升级到最新版本
|
||||
#### 4. 升级镜像
|
||||
|
||||
```bash
|
||||
# 停止并删除旧容器
|
||||
@@ -299,11 +562,52 @@ docker stats katelyatv
|
||||
docker run --rm -v katelyatv_data:/data -v $(pwd):/backup alpine tar czf /backup/katelyatv-backup.tar.gz /data
|
||||
```
|
||||
|
||||
## 🐳 Docker Compose 最佳实践
|
||||
## 🐙 Docker Compose 最佳实践
|
||||
|
||||
Docker Compose 是管理多容器应用的最佳方式，特别适合需要数据库支持的部署场景。
|
||||
|
||||
### 📝 LocalStorage 版本（基础）
|
||||
## 📚 功能使用教程
|
||||
|
||||
### ⏭️ 跳过片头片尾功能
|
||||
|
||||
KatelyaTV 提供了智能的跳过片头片尾功能，帮助您快速进入正片内容。
|
||||
|
||||
#### 🎯 如何使用
|
||||
|
||||
1. **自动检测**：系统会自动检测已设置的跳过片段，在观看时显示跳过按钮
|
||||
2. **手动设置**：在播放页面标题右侧点击"跳过设置"按钮
|
||||
3. **添加片段**：选择片头或片尾类型，设置开始和结束时间
|
||||
4. **保存配置**：配置会自动保存并应用到当前剧集
|
||||
|
||||
#### ⚙️ 功能特点
|
||||
|
||||
- **智能检测**：自动识别播放时间是否在跳过区间内
|
||||
- **手动配置**：支持精确设置跳过时间段（精确到秒）
|
||||
- **多类型支持**：支持片头、片尾等不同类型的跳过片段
|
||||
- **跨设备同步**：配置数据支持多设备同步（需使用 Redis/D1/Upstash 存储）
|
||||
- **个性化**：每个用户可独立设置不同的跳过偏好
|
||||
|
||||
#### 💾 存储支持
|
||||
|
||||
| 存储类型 | 支持状态 | 同步能力 | 推荐场景 |
|
||||
| ------------- | -------- | --------- | --------------- |
|
||||
| LocalStorage | ✅ | ❌ 单设备 | 个人本地使用 |
|
||||
| Redis | ✅ | ✅ 多设备 | 家庭/团队使用 |
|
||||
| Cloudflare D1 | ✅ | ✅ 多设备 | Cloudflare 部署 |
|
||||
| Upstash | ✅ | ✅ 多设备 | 无服务器部署 |
|
||||
|
||||
> ⚠️ **D1 用户注意**：如果你之前已经部署了项目并使用 D1 数据库，需要手动更新数据库表结构才能使用跳过功能。请参考 [D1_MIGRATION.md](./D1_MIGRATION.md) 进行升级。
|
||||
|
||||
#### 🛠️ 使用技巧
|
||||
|
||||
- **最佳时机**：建议在剧集开始播放后设置，可以实时看到当前播放时间
|
||||
- **时间精度**：支持小数点精度，如 `90.5` 秒
|
||||
- **批量设置**：一次设置后，所有相同剧集都会应用相同规则
|
||||
- **删除管理**：可以随时删除不需要的跳过片段
|
||||
|
||||
## 📁 配置说明
|
||||
|
||||
### 📝 LocalStorage（基础单机）
|
||||
|
||||
适合个人使用，数据存储在浏览器本地：
|
||||
|
||||
@@ -326,7 +630,15 @@ services:
|
||||
# volumes:
|
||||
# - ./config.json:/app/config.json:ro
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000"]
|
||||
test:
|
||||
[
|
||||
'CMD',
|
||||
'wget',
|
||||
'--quiet',
|
||||
'--tries=1',
|
||||
'--spider',
|
||||
'http://localhost:3000',
|
||||
]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
@@ -334,6 +646,7 @@ services:
|
||||
```
|
||||
|
||||
**启动命令：**
|
||||
|
||||
```bash
|
||||
# 创建并启动服务
|
||||
docker compose up -d
|
||||
@@ -345,7 +658,7 @@ docker compose ps
|
||||
docker compose logs -f katelyatv
|
||||
```
|
||||
|
||||
### 🔐 Redis 版本（推荐）
|
||||
### 🔐 Redis 版本（推荐：多用户 + 同步）
|
||||
|
||||
支持多用户、跨设备数据同步、完整的用户权限管理：
|
||||
|
||||
@@ -364,18 +677,18 @@ services:
|
||||
# 基础配置
|
||||
- SITE_NAME=KatelyaTV 影视站
|
||||
- ANNOUNCEMENT=支持多用户注册，请合理使用！
|
||||
|
||||
|
||||
# 管理员账号（重要！）
|
||||
- USERNAME=admin
|
||||
- PASSWORD=admin_super_secure_password
|
||||
|
||||
|
||||
# Redis 存储配置
|
||||
- NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
- REDIS_URL=redis://katelyatv-redis:6379
|
||||
|
||||
|
||||
# 用户功能
|
||||
- NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
|
||||
|
||||
# 可选：搜索配置
|
||||
- NEXT_PUBLIC_SEARCH_MAX_PAGE=8
|
||||
networks:
|
||||
@@ -388,7 +701,15 @@ services:
|
||||
# - ./config.json:/app/config.json:ro
|
||||
# - ./logs:/app/logs
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000"]
|
||||
test:
|
||||
[
|
||||
'CMD',
|
||||
'wget',
|
||||
'--quiet',
|
||||
'--tries=1',
|
||||
'--spider',
|
||||
'http://localhost:3000',
|
||||
]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
@@ -405,7 +726,7 @@ services:
|
||||
# Redis 数据持久化
|
||||
- katelyatv-redis-data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
test: ['CMD', 'redis-cli', 'ping']
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
@@ -434,20 +755,42 @@ mkdir katelyatv && cd katelyatv
|
||||
# 2. 创建 docker-compose.yml 文件（复制上面的内容）
|
||||
nano docker-compose.yml
|
||||
|
||||
# 3. 启动所有服务
|
||||
# 3. 检查配置文件语法
|
||||
docker compose config
|
||||
|
||||
# 4. 启动所有服务
|
||||
docker compose up -d
|
||||
|
||||
# 4. 查看服务状态
|
||||
# 5. 查看服务状态
|
||||
docker compose ps
|
||||
|
||||
# 5. 查看启动日志
|
||||
# 6. 查看启动日志
|
||||
docker compose logs -f
|
||||
|
||||
# 6. 首次访问 http://your-server:3000
|
||||
# 7. 等待服务完全启动（通常需要 30-60 秒）
|
||||
# 检查健康状态
|
||||
docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Ports}}"
|
||||
|
||||
# 8. 首次访问 http://your-server:3000
|
||||
# 使用管理员账号 admin / admin_super_secure_password 登录
|
||||
# 然后访问 /admin 进行管理员配置
|
||||
```
|
||||
|
||||
**🔍 部署验证步骤：**
|
||||
|
||||
```bash
|
||||
# 验证 Redis 连接
|
||||
docker compose exec katelyatv-redis redis-cli ping
|
||||
# 应该返回 "PONG"
|
||||
|
||||
# 验证 KatelyaTV 服务
|
||||
curl -I http://localhost:3000
|
||||
# 应该返回 HTTP 200 状态码
|
||||
|
||||
# 查看服务启动顺序
|
||||
docker compose logs --timestamps | grep "Ready in"
|
||||
```
|
||||
|
||||
### 🔄 管理与维护
|
||||
|
||||
```bash
|
||||
@@ -482,6 +825,56 @@ docker compose down -v --remove-orphans
|
||||
4. **资源监控**：定期检查容器资源使用情况，必要时调整配置
|
||||
5. **日志管理**：配置日志轮转，避免日志文件过大
|
||||
|
||||
### 🛠️ 常见部署问题排查
|
||||
|
||||
**问题 1：容器启动失败**
|
||||
|
||||
```bash
|
||||
# 检查容器状态
|
||||
docker compose ps
|
||||
|
||||
# 查看详细错误日志
|
||||
docker compose logs katelyatv
|
||||
|
||||
# 常见原因：端口被占用、环境变量配置错误、镜像拉取失败
|
||||
```
|
||||
|
||||
**问题 2：Redis 连接失败**
|
||||
|
||||
```bash
|
||||
# 检查 Redis 容器状态
|
||||
docker compose exec katelyatv-redis redis-cli ping
|
||||
|
||||
# 检查网络连通性
|
||||
docker compose exec katelyatv ping katelyatv-redis
|
||||
|
||||
# 验证环境变量
|
||||
docker compose exec katelyatv env | grep REDIS
|
||||
```
|
||||
|
||||
**问题 3：Upstash Redis 连接问题**
|
||||
|
||||
```bash
|
||||
# 验证 Upstash 配置
|
||||
curl -H "Authorization: Bearer YOUR_TOKEN" YOUR_UPSTASH_URL/ping
|
||||
|
||||
# 检查环境变量格式
|
||||
echo $UPSTASH_URL # 应该是 https://xxx.upstash.io
|
||||
echo $UPSTASH_TOKEN # 应该是长字符串令牌
|
||||
```
|
||||
|
||||
**问题 4：Cloudflare D1 初始化失败**
|
||||
|
||||
- 确保在 D1 控制台中正确执行了所有 SQL 语句
|
||||
- 检查数据库绑定名称是否为 `DB`
|
||||
- 验证环境变量 `NEXT_PUBLIC_STORAGE_TYPE=d1`
|
||||
|
||||
**问题 5：Vercel 部署问题**
|
||||
|
||||
- 检查环境变量是否正确设置
|
||||
- 确保 `config.json` 文件格式正确
|
||||
- 查看 Vercel 部署日志中的错误信息
|
||||
|
||||
## 🔄 自动同步最近更改
|
||||
|
||||
建议在 fork 的仓库中启用本仓库自带的 GitHub Actions 自动同步功能（见 `.github/workflows/sync.yml`）。
|
||||
@@ -490,6 +883,8 @@ docker compose down -v --remove-orphans
|
||||
|
||||
## ⚙️ 环境变量
|
||||
|
||||
### 📋 变量说明表
|
||||
|
||||
| 变量 | 说明 | 可选值 | 默认值 |
|
||||
| --------------------------- | ----------------------------------------------------------- | -------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
|
||||
| USERNAME | redis 部署时的管理员账号 | 任意字符串 | （空） |
|
||||
@@ -505,7 +900,23 @@ docker compose down -v --remove-orphans
|
||||
| NEXT_PUBLIC_IMAGE_PROXY | 默认的浏览器端图片代理 | url prefix | (空) |
|
||||
| NEXT_PUBLIC_DOUBAN_PROXY | 默认的浏览器端豆瓣数据代理 | url prefix | (空) |
|
||||
|
||||
## 📋 配置说明
|
||||
### 🔧 配置验证
|
||||
|
||||
**部署后可通过以下方式验证环境变量是否生效：**
|
||||
|
||||
1. **访问服务状态页**：`http://your-domain/api/server-config`
|
||||
2. **检查管理员面板**：使用管理员账号登录后访问 `/admin`
|
||||
3. **查看容器日志**：
|
||||
|
||||
```bash
|
||||
# Docker 单容器
|
||||
docker logs katelyatv
|
||||
|
||||
# Docker Compose
|
||||
docker compose logs katelyatv
|
||||
```
|
||||
|
||||
## � 配置说明
|
||||
|
||||
所有可自定义项集中在根目录的 `config.json` 中：
|
||||
|
||||
@@ -590,7 +1001,7 @@ KatelyaTV 支持标准的苹果 CMS V10 API 格式。
|
||||
|
||||
[MIT](LICENSE) © 2025 KatelyaTV & Contributors
|
||||
|
||||
## � Star History
|
||||
## ⭐ Star History
|
||||
|
||||
<div align="center">
|
||||
|
||||
@@ -626,7 +1037,7 @@ KatelyaTV 支持标准的苹果 CMS V10 API 格式。
|
||||
|
||||
- [ts-nextjs-tailwind-starter](https://github.com/theodorusclarence/ts-nextjs-tailwind-starter) — 项目最初基于该脚手架。
|
||||
- [LibreTV](https://github.com/LibreSpark/LibreTV) — 由此启发，站在巨人的肩膀上。
|
||||
- [LunaTV-原MoonTV](https://github.com/MoonTechLab/LunaTV) — 原始项目与作者社区，感谢原作奠定坚实基础。
|
||||
- [LunaTV-原 MoonTV](https://github.com/MoonTechLab/LunaTV) — 原始项目与作者社区，感谢原作奠定坚实基础。
|
||||
- [ArtPlayer](https://github.com/zhw2590582/ArtPlayer) — 提供强大的网页视频播放器。
|
||||
- [HLS.js](https://github.com/video-dev/hls.js) — 实现 HLS 流媒体在浏览器中的播放支持。
|
||||
- 感谢所有提供免费影视接口的站点。
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
# 🎉 KatelyaTV v0.5.0-katelya
|
||||
|
||||
> **重大更新**：智能跳过片头片尾功能 + 多平台兼容性增强
|
||||
|
||||
## ✨ 主要新增功能
|
||||
|
||||
### 🎬 智能跳过片头片尾系统
|
||||
|
||||
- **批量设置**：支持同时配置片头片尾跳过时间
|
||||
- **智能检测**：自动识别片头片尾时间点
|
||||
- **时间格式**：直观的"分:秒"格式输入（如 1:30）
|
||||
- **自动跳转**：支持自动跳到下一集功能
|
||||
- **浮动界面**：美观的跳过提示，不遮挡视频内容
|
||||
- **倒计时显示**：5秒跳过倒计时提醒
|
||||
- **全存储支持**：LocalStorage、Redis、D1、Upstash 全兼容
|
||||
|
||||
### 🔧 技术架构优化
|
||||
|
||||
- **统一构建工具**：全面切换到 pnpm，提升构建速度 50%+
|
||||
- **多平台兼容**：完美支持 Cloudflare Pages、Docker、Vercel
|
||||
- **Edge Runtime**：Cloudflare Pages 使用 Edge Runtime 优化
|
||||
- **自动转换**：Docker 部署时自动转换为 Node.js Runtime
|
||||
|
||||
### 🗄️ 数据库增强
|
||||
|
||||
- **新增表结构**：`skip_configs` 表用于存储跳过配置
|
||||
- **索引优化**：完整的数据库索引提升查询性能
|
||||
- **迁移文档**：提供现有数据库的迁移指南
|
||||
|
||||
## 🔄 改进与修复
|
||||
|
||||
### 📦 构建系统
|
||||
|
||||
- 统一使用 pnpm 包管理器
|
||||
- 优化 Cloudflare Pages 构建配置
|
||||
- 修复 GitHub Actions 工作流语法错误
|
||||
- 更新所有仓库引用到新的 katelya77/KatelyaTV
|
||||
|
||||
### 🎨 用户界面
|
||||
|
||||
- 跳过配置界面重新设计
|
||||
- 支持批量设置片头片尾
|
||||
- 修复界面重叠问题
|
||||
- 优化时间输入体验
|
||||
|
||||
### 🛠️ 开发体验
|
||||
|
||||
- 修复 ESLint 错误
|
||||
- 清理无用配置文件
|
||||
- 优化版本检查机制
|
||||
- 完善 Docker 兼容性测试
|
||||
|
||||
## 🚀 部署指南
|
||||
|
||||
### Cloudflare Pages（推荐）
|
||||
|
||||
```bash
|
||||
# 构建命令
|
||||
pnpm pages:build
|
||||
|
||||
# 输出目录
|
||||
.vercel/output/static
|
||||
```
|
||||
|
||||
### Docker 部署
|
||||
|
||||
```bash
|
||||
docker pull ghcr.io/katelya77/katelyatv:v0.5.0-katelya
|
||||
docker run -d --name katelyatv -p 3000:3000 \
|
||||
--env PASSWORD=your_password \
|
||||
ghcr.io/katelya77/katelyatv:v0.5.0-katelya
|
||||
```
|
||||
|
||||
### Vercel 部署
|
||||
|
||||
```bash
|
||||
# 构建命令
|
||||
pnpm run build
|
||||
```
|
||||
|
||||
## 📋 环境变量
|
||||
|
||||
| 变量 | 说明 | 默认值 |
|
||||
| ------------------------ | ---------- | ------------ |
|
||||
| PASSWORD | 访问密码 | 必填 |
|
||||
| NEXT_PUBLIC_STORAGE_TYPE | 存储类型 | localstorage |
|
||||
| USERNAME | 管理员账号 | 空 |
|
||||
|
||||
## 🆕 新功能使用说明
|
||||
|
||||
### 跳过片头片尾设置
|
||||
|
||||
1. 在播放页面点击"跳过设置"按钮
|
||||
2. 选择"批量设置"模式
|
||||
3. 输入片头时间（如：1:30）
|
||||
4. 输入片尾时间（如：1:30）
|
||||
5. 开启"自动跳过"和"自动下一集"
|
||||
6. 保存设置
|
||||
|
||||
### 智能检测功能
|
||||
|
||||
- 系统会根据播放行为自动学习片头片尾时间
|
||||
- 支持自动识别常见的片头片尾模式
|
||||
- 提供5秒倒计时，可手动取消跳过
|
||||
|
||||
## 🔧 技术升级
|
||||
|
||||
### 构建工具统一
|
||||
|
||||
- 所有平台统一使用 pnpm
|
||||
- 构建速度提升 2-3 倍
|
||||
- 磁盘空间节省 50%+
|
||||
|
||||
### 多平台兼容
|
||||
|
||||
- **Cloudflare Pages**: 使用 Edge Runtime，全球CDN加速
|
||||
- **Docker**: 自动转换 Runtime，支持多架构
|
||||
- **Vercel**: 优化构建配置，快速部署
|
||||
|
||||
## 🔗 相关资源
|
||||
|
||||
- [项目文档](https://github.com/katelya77/KatelyaTV#readme)
|
||||
- [问题反馈](https://github.com/katelya77/KatelyaTV/issues)
|
||||
- [功能讨论](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
- [贡献指南](https://github.com/katelya77/KatelyaTV/blob/main/CONTRIBUTING.md)
|
||||
|
||||
## 🙏 致谢
|
||||
|
||||
感谢所有用户的反馈和建议，特别是跳过片头片尾功能的需求。本版本致力于提供更智能、更便捷的观影体验。
|
||||
|
||||
## 📈 版本对比
|
||||
|
||||
| 功能 | v0.4.0 | v0.5.0 |
|
||||
| ------------ | ------ | ------ |
|
||||
| 跳过片头片尾 | ❌ | ✅ |
|
||||
| 批量设置 | ❌ | ✅ |
|
||||
| 智能检测 | ❌ | ✅ |
|
||||
| 自动下一集 | ❌ | ✅ |
|
||||
| pnpm 构建 | ❌ | ✅ |
|
||||
| Edge Runtime | ❌ | ✅ |
|
||||
| 多存储支持 | ✅ | ✅ |
|
||||
| Docker 部署 | ✅ | ✅ |
|
||||
|
||||
---
|
||||
|
||||
**注意**: 本项目仅供学习和个人使用，请遵守当地法律法规。
|
||||
|
||||
**发布日期**: 2025年9月2日
|
||||
**版本标签**: v0.5.0-katelya
|
||||
@@ -0,0 +1,123 @@
|
||||
# 🎬 智能跳过功能使用指南
|
||||
|
||||
## ✨ 功能特色
|
||||
|
||||
### 🚀 全新智能跳过体验
|
||||
|
||||
- **🎯 分:秒格式输入** - 更符合观影习惯，如 `2:10` 表示 2 分 10 秒
|
||||
- **⚡ 自动跳过** - 无需手动点击，到达设定时间自动跳转
|
||||
- **🎭 智能片尾** - 可设置从指定时间直接跳转下一集
|
||||
- **🎨 优化布局** - 悬浮式配置显示，不与内容重叠
|
||||
|
||||
## 📱 使用方法
|
||||
|
||||
### 1. 开启跳过设置
|
||||
|
||||
在播放页面，点击标题右侧的 **"跳过设置"** 按钮
|
||||
|
||||
### 2. 智能配置模式（推荐）
|
||||
|
||||
#### 全局开关
|
||||
|
||||
- ✅ **启用自动跳过** - 到达时间自动跳转，无需手动点击
|
||||
- ✅ **片尾自动播放下一集** - 片尾时显示倒计时，自动播放下一集
|
||||
|
||||
#### 片头设置
|
||||
|
||||
- **开始时间**: `0:00` (通常从视频开始)
|
||||
- **结束时间**: `2:10` (跳过 2 分 10 秒的片头)
|
||||
|
||||
#### 片尾设置
|
||||
|
||||
- **开始时间**: `19:20` (从 19 分 20 秒开始检测片尾)
|
||||
- **结束时间**: 留空 (直接跳转下一集) 或 `20:50` (跳过片尾到此时间)
|
||||
|
||||
### 3. 支持的时间格式
|
||||
|
||||
- **分:秒格式**: `2:10`, `19:20`, `1:30.5`
|
||||
- **秒数格式**: `130`, `1160`, `90.5`
|
||||
- **自动识别**: 系统会自动识别并转换格式
|
||||
|
||||
## 🎯 使用场景示例
|
||||
|
||||
### 场景一：跳过片头
|
||||
|
||||
```
|
||||
片头设置:
|
||||
开始时间: 0:00
|
||||
结束时间: 2:10
|
||||
|
||||
效果: 视频开始播放时，自动从0秒跳转到2分10秒
|
||||
```
|
||||
|
||||
### 场景二：片尾直接下一集
|
||||
|
||||
```
|
||||
片尾设置:
|
||||
开始时间: 19:20
|
||||
结束时间: 留空
|
||||
|
||||
效果: 播放到19分20秒时，显示倒计时，自动播放下一集
|
||||
```
|
||||
|
||||
### 场景三：跳过片头+片尾
|
||||
|
||||
```
|
||||
片头: 0:00 → 2:10 (跳过片头)
|
||||
片尾: 19:20 → 留空 (直接下一集)
|
||||
|
||||
效果: 完全自动化的观影体验
|
||||
```
|
||||
|
||||
## 🎨 界面说明
|
||||
|
||||
### 播放时显示
|
||||
|
||||
- **倒计时器**: 片尾时屏幕中央显示"X 秒后自动播放下一集"
|
||||
- **跳过提示**: 自动跳过时显示"自动跳过片头/片尾"
|
||||
- **取消按钮**: 可随时取消自动操作
|
||||
|
||||
### 配置显示
|
||||
|
||||
- **悬浮卡片**: 右下角显示当前跳过配置
|
||||
- **状态标识**: 显示自动跳过状态
|
||||
- **快速修改**: 点击卡片可快速修改配置
|
||||
|
||||
## ⚙️ 高级功能
|
||||
|
||||
### 精确设置
|
||||
|
||||
- 支持小数点精度: `90.5` 秒
|
||||
- 支持多段跳过: 可设置多个片头/片尾段落
|
||||
- 智能检测: 自动识别当前播放时间是否在跳过区间
|
||||
|
||||
### 数据同步
|
||||
|
||||
- **LocalStorage**: 单设备本地存储
|
||||
- **云端同步**: 支持 Redis、D1、Upstash 跨设备同步
|
||||
- **实时更新**: 配置修改后立即生效
|
||||
|
||||
## 🔧 故障排除
|
||||
|
||||
### 常见问题
|
||||
|
||||
1. **时间格式错误**: 确保使用 `分:秒` 格式，如 `2:10`
|
||||
2. **配置不生效**: 检查是否开启了"启用自动跳过"开关
|
||||
3. **重叠显示**: 新版本已修复，配置卡片不会与内容重叠
|
||||
|
||||
### 兼容性
|
||||
|
||||
- ✅ 支持所有部署方式 (Docker, Vercel, Cloudflare Pages)
|
||||
- ✅ 支持所有存储后端 (LocalStorage, Redis, D1, Upstash)
|
||||
- ✅ 支持桌面和移动设备
|
||||
|
||||
## 💡 使用技巧
|
||||
|
||||
1. **首次设置**: 建议先观看一遍内容，记录片头片尾时间
|
||||
2. **批量配置**: 使用智能配置模式一次性设置片头和片尾
|
||||
3. **个性化**: 不同类型的内容可以设置不同的跳过规则
|
||||
4. **测试验证**: 设置后可以快进到设定时间测试效果
|
||||
|
||||
---
|
||||
|
||||
🎉 **享受更流畅的观影体验！**
|
||||
+1
-1
@@ -1 +1 @@
|
||||
20250901193125
|
||||
20250902153459
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "katelyatv",
|
||||
"version": "0.4.0-katelya",
|
||||
"version": "0.5.0-katelya",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "npm run gen:runtime && npm run gen:manifest && next dev -H 0.0.0.0",
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
if(!self.define){let e,s={};const n=(n,t)=>(n=new URL(n+".js",t).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(t,c)=>{const i=e||("document"in self?document.currentScript.src:"")||location.href;if(s[i])return;let a={};const r=e=>n(e,i),o={module:{uri:i},exports:a,require:r};s[i]=Promise.all(t.map(e=>o[e]||r(e))).then(e=>(c(...e),a))}}define(["./workbox-4754cb34"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/app-build-manifest.json",revision:"4cc81709a85016d2e1325aec145aa599"},{url:"/_next/static/chunks/100-efcc706557360c1e.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/117-712c1385f002eef0.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/262-b67318e67f316783.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/41ade5dc-797c284ea15e5986.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/519-9968375803c5bb08.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/827-35ccbd32f32feb33.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/872-010f54d5928bfbfd.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/886-b0b555a14550a8dc.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/97-d35e729ca3ec6714.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/a4634e51-a3fb94d869211083.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/_not-found/page-231758babf57b819.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/admin/page-094e47d9aa7845e0.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/douban/page-75ce0c7d2b4cff9c.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/layout-870a3b1d3b21202a.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/login/page-b79e53e406bf669d.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/page-61b1291c1aa52317.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/play/page-d478c791ff7bae46.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/search/page-2e6fb9284b7fe3b7.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/app/warning/page-6c04923bb35d02d2.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/fd9d1056-5fb180716357b830.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/framework-f66176bb897dc684.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/main-33b2d4bbe5672234.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/main-app-073eb01104a135dc.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/pages/_app-72b849fbd24ac258.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/pages/_error-7ba65e1336b92748.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-05e23bcac07e9541.js",revision:"m91B5pHK189d_DOw2NJtJ"},{url:"/_next/static/css/01f6801b310b5690.css",revision:"01f6801b310b5690"},{url:"/_next/static/css/275ed64cc4367444.css",revision:"275ed64cc4367444"},{url:"/_next/static/css/2da794711423e5a1.css",revision:"2da794711423e5a1"},{url:"/_next/static/m91B5pHK189d_DOw2NJtJ/_buildManifest.js",revision:"c155cce658e53418dec34664328b51ac"},{url:"/_next/static/m91B5pHK189d_DOw2NJtJ/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/_next/static/media/26a46d62cd723877-s.woff2",revision:"befd9c0fdfa3d8a645d5f95717ed6420"},{url:"/_next/static/media/55c55f0601d81cf3-s.woff2",revision:"43828e14271c77b87e3ed582dbff9f74"},{url:"/_next/static/media/581909926a08bbc8-s.woff2",revision:"f0b86e7c24f455280b8df606b89af891"},{url:"/_next/static/media/8e9860b6e62d6359-s.woff2",revision:"01ba6c2a184b8cba08b0d57167664d75"},{url:"/_next/static/media/97e0cb1ae144a2a9-s.woff2",revision:"e360c61c5bd8d90639fd4503c829c2dc"},{url:"/_next/static/media/df0a9ae256c0569c-s.woff2",revision:"d54db44de5ccb18886ece2fda72bdfe0"},{url:"/_next/static/media/e4af272ccee01ff0-s.p.woff2",revision:"65850a373e258f1c897a2b3d75eb74de"},{url:"/favicon.ico",revision:"c5de6e56c5664adda146825f75ea6ecf"},{url:"/icons/icon-192x192.png",revision:"4a56c090828a1ad254c903c7aec0389d"},{url:"/icons/icon-256x256.png",revision:"f6409eb1a001f754121e3a8281c0319c"},{url:"/icons/icon-384x384.png",revision:"f6efc3e357b9ffdf4e0d8c14b2ed0ac1"},{url:"/icons/icon-512x512.png",revision:"9c008cbbeb6a576fe07bb1284a83f4d2"},{url:"/logo.png",revision:"40de611b143c47c6291c7bdad2c959ca"},{url:"/manifest.json",revision:"7bd3dabc1cfbfe40f09577efca223d31"},{url:"/robots.txt",revision:"e2b2cd8514443456bc6fb9d77b3b1f3e"},{url:"/screenshot1.png",revision:"10572bfcea54dc93ac4c5f7c9057fc98"},{url:"/screenshot2.png",revision:"f815a8990973a221899976867365c239"},{url:"/screenshot3.png",revision:"49709e96345dfeeab1d8083821d4b44e"},{url:"/screenshot4.png",revision:"a76c751e41e37556048a487e4f8b8b1c"}],{ignoreURLParametersMatching:[]}),e.cleanupOutdatedCaches(),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[{cacheWillUpdate:async({request:e,response:s,event:n,state:t})=>s&&"opaqueredirect"===s.type?new Response(s.body,{status:200,statusText:"OK",headers:s.headers}):s}]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,new e.CacheFirst({cacheName:"google-fonts-webfonts",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:31536e3})]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,new e.StaleWhileRevalidate({cacheName:"google-fonts-stylesheets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,new e.StaleWhileRevalidate({cacheName:"static-font-assets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,new e.StaleWhileRevalidate({cacheName:"static-image-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/image\?url=.+$/i,new e.StaleWhileRevalidate({cacheName:"next-image",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp3|wav|ogg)$/i,new e.CacheFirst({cacheName:"static-audio-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp4)$/i,new e.CacheFirst({cacheName:"static-video-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:js)$/i,new e.StaleWhileRevalidate({cacheName:"static-js-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:css|less)$/i,new e.StaleWhileRevalidate({cacheName:"static-style-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/data\/.+\/.+\.json$/i,new e.StaleWhileRevalidate({cacheName:"next-data",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:json|xml|csv)$/i,new e.NetworkFirst({cacheName:"static-data-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;const s=e.pathname;return!s.startsWith("/api/auth/")&&!!s.startsWith("/api/")},new e.NetworkFirst({cacheName:"apis",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:16,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;return!e.pathname.startsWith("/api/")},new e.NetworkFirst({cacheName:"others",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>!(self.origin===e.origin),new e.NetworkFirst({cacheName:"cross-origin",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:3600})]}),"GET")});
|
||||
if(!self.define){let e,s={};const c=(c,n)=>(c=new URL(c+".js",n).href,s[c]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=c,e.onload=s,document.head.appendChild(e)}else e=c,importScripts(c),s()}).then(()=>{let e=s[c];if(!e)throw new Error(`Module ${c} didn’t register its module`);return e}));self.define=(n,a)=>{const i=e||("document"in self?document.currentScript.src:"")||location.href;if(s[i])return;let t={};const r=e=>c(e,i),o={module:{uri:i},exports:t,require:r};s[i]=Promise.all(n.map(e=>o[e]||r(e))).then(e=>(a(...e),t))}}define(["./workbox-e9849328"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/app-build-manifest.json",revision:"7c3d1f3a59bd37bd6b0e05018ebf9f32"},{url:"/_next/static/Vsc7_jLIvSZ-BKyHRSsrR/_buildManifest.js",revision:"046380ae5bc74b46b6d5eac3eed65355"},{url:"/_next/static/Vsc7_jLIvSZ-BKyHRSsrR/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/_next/static/chunks/110-adb836a0730c35e7.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/154-de4a84fd5b2e0100.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/29-0844689411ca7d55.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/459-6bec40a8423cc309.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/51b697cb-f464f3017ac1ea30.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/682-d1dca8d17a3a8e6f.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/900-fb094d8873768e88.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/967-217cdcb80ae3beeb.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/998-568996670b543597.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/_not-found/page-ac328df06cf68f14.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/admin/page-d0def26e413c060d.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/douban/page-2d0023184aa37aff.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/layout-bd0bfbfdb401e15f.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/login/page-320c4f54724f3464.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/page-6a58e37ab3250691.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/play/page-63b2dae5d7950b37.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/search/page-63fe30b91e0539a7.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/app/warning/page-11cba4cf9332a238.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/c72274ce-06682d6fc8197e6d.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/da9543df-bf6da1a431d8604f.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/framework-6e06c675866dc992.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/main-95de9e33689c098a.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/main-app-dbd320e104e1a5dc.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/pages/_app-792b631a362c29e1.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/pages/_error-9fde6601392a2a99.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-17170f1d90853b2d.js",revision:"Vsc7_jLIvSZ-BKyHRSsrR"},{url:"/_next/static/css/23100062f5d4aac0.css",revision:"23100062f5d4aac0"},{url:"/_next/static/css/275ed64cc4367444.css",revision:"275ed64cc4367444"},{url:"/_next/static/css/f947920f7dec8442.css",revision:"f947920f7dec8442"},{url:"/_next/static/media/26a46d62cd723877-s.woff2",revision:"befd9c0fdfa3d8a645d5f95717ed6420"},{url:"/_next/static/media/55c55f0601d81cf3-s.woff2",revision:"43828e14271c77b87e3ed582dbff9f74"},{url:"/_next/static/media/581909926a08bbc8-s.woff2",revision:"f0b86e7c24f455280b8df606b89af891"},{url:"/_next/static/media/8e9860b6e62d6359-s.woff2",revision:"01ba6c2a184b8cba08b0d57167664d75"},{url:"/_next/static/media/97e0cb1ae144a2a9-s.woff2",revision:"e360c61c5bd8d90639fd4503c829c2dc"},{url:"/_next/static/media/df0a9ae256c0569c-s.woff2",revision:"d54db44de5ccb18886ece2fda72bdfe0"},{url:"/_next/static/media/e4af272ccee01ff0-s.p.woff2",revision:"65850a373e258f1c897a2b3d75eb74de"},{url:"/favicon.ico",revision:"c5de6e56c5664adda146825f75ea6ecf"},{url:"/icons/icon-192x192.png",revision:"4a56c090828a1ad254c903c7aec0389d"},{url:"/icons/icon-256x256.png",revision:"f6409eb1a001f754121e3a8281c0319c"},{url:"/icons/icon-384x384.png",revision:"f6efc3e357b9ffdf4e0d8c14b2ed0ac1"},{url:"/icons/icon-512x512.png",revision:"9c008cbbeb6a576fe07bb1284a83f4d2"},{url:"/logo.png",revision:"40de611b143c47c6291c7bdad2c959ca"},{url:"/manifest.json",revision:"7bd3dabc1cfbfe40f09577efca223d31"},{url:"/robots.txt",revision:"e2b2cd8514443456bc6fb9d77b3b1f3e"},{url:"/screenshot1.png",revision:"10572bfcea54dc93ac4c5f7c9057fc98"},{url:"/screenshot2.png",revision:"f815a8990973a221899976867365c239"},{url:"/screenshot3.png",revision:"49709e96345dfeeab1d8083821d4b44e"},{url:"/screenshot4.png",revision:"a76c751e41e37556048a487e4f8b8b1c"},{url:"/wechat.jpg",revision:"d0f601311802667cd6ca5a37dc69bfa7"}],{ignoreURLParametersMatching:[]}),e.cleanupOutdatedCaches(),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[{cacheWillUpdate:async({request:e,response:s,event:c,state:n})=>s&&"opaqueredirect"===s.type?new Response(s.body,{status:200,statusText:"OK",headers:s.headers}):s}]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,new e.CacheFirst({cacheName:"google-fonts-webfonts",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:31536e3})]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,new e.StaleWhileRevalidate({cacheName:"google-fonts-stylesheets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,new e.StaleWhileRevalidate({cacheName:"static-font-assets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,new e.StaleWhileRevalidate({cacheName:"static-image-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/image\?url=.+$/i,new e.StaleWhileRevalidate({cacheName:"next-image",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp3|wav|ogg)$/i,new e.CacheFirst({cacheName:"static-audio-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp4)$/i,new e.CacheFirst({cacheName:"static-video-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:js)$/i,new e.StaleWhileRevalidate({cacheName:"static-js-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:css|less)$/i,new e.StaleWhileRevalidate({cacheName:"static-style-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/data\/.+\/.+\.json$/i,new e.StaleWhileRevalidate({cacheName:"next-data",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:json|xml|csv)$/i,new e.NetworkFirst({cacheName:"static-data-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;const s=e.pathname;return!s.startsWith("/api/auth/")&&!!s.startsWith("/api/")},new e.NetworkFirst({cacheName:"apis",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:16,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;return!e.pathname.startsWith("/api/")},new e.NetworkFirst({cacheName:"others",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>!(self.origin===e.origin),new e.NetworkFirst({cacheName:"cross-origin",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:3600})]}),"GET")});
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Docker 部署兼容性测试脚本
|
||||
* 模拟 Docker 构建过程中的 Edge Runtime 转换
|
||||
*/
|
||||
|
||||
/* eslint-disable @typescript-eslint/no-var-requires */
|
||||
/* eslint-disable no-console */
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
console.log('🐳 模拟 Docker 构建过程中的 Runtime 转换...');
|
||||
|
||||
// 模拟 Dockerfile 中的 sed 命令
|
||||
function convertEdgeToNodeRuntime() {
|
||||
const srcDir = path.join(__dirname, '../src');
|
||||
const routeFiles = [];
|
||||
|
||||
// 递归查找所有 route.ts 文件
|
||||
function findRouteFiles(dir) {
|
||||
const files = fs.readdirSync(dir);
|
||||
for (const file of files) {
|
||||
const fullPath = path.join(dir, file);
|
||||
const stat = fs.statSync(fullPath);
|
||||
|
||||
if (stat.isDirectory()) {
|
||||
findRouteFiles(fullPath);
|
||||
} else if (file === 'route.ts') {
|
||||
routeFiles.push(fullPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
findRouteFiles(srcDir);
|
||||
|
||||
console.log(`📁 找到 ${routeFiles.length} 个 API 路由文件:`);
|
||||
|
||||
let convertedCount = 0;
|
||||
|
||||
for (const routeFile of routeFiles) {
|
||||
const content = fs.readFileSync(routeFile, 'utf8');
|
||||
|
||||
if (content.includes("export const runtime = 'edge';")) {
|
||||
console.log(` ✓ ${path.relative(__dirname, routeFile)} - 包含 Edge Runtime`);
|
||||
|
||||
// 在测试中我们不实际修改文件，只是检查
|
||||
// const newContent = content.replace(/export const runtime = 'edge';/g, "export const runtime = 'nodejs';");
|
||||
// fs.writeFileSync(routeFile, newContent);
|
||||
|
||||
convertedCount++;
|
||||
} else {
|
||||
console.log(` ⚠ ${path.relative(__dirname, routeFile)} - 未找到 Edge Runtime 配置`);
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`\n🔄 Docker 构建将转换 ${convertedCount} 个文件的 Runtime 配置`);
|
||||
console.log(' Edge Runtime → Node.js Runtime');
|
||||
|
||||
return convertedCount;
|
||||
}
|
||||
|
||||
// 检查跳过配置 API 是否包含在转换列表中
|
||||
function checkSkipConfigsAPI() {
|
||||
const skipConfigsRoute = path.join(__dirname, '../src/app/api/skip-configs/route.ts');
|
||||
|
||||
if (!fs.existsSync(skipConfigsRoute)) {
|
||||
console.error('❌ 跳过配置 API 路由文件不存在!');
|
||||
return false;
|
||||
}
|
||||
|
||||
const content = fs.readFileSync(skipConfigsRoute, 'utf8');
|
||||
|
||||
if (content.includes("export const runtime = 'edge';")) {
|
||||
console.log('✅ 跳过配置 API 正确配置了 Edge Runtime');
|
||||
console.log(' Docker 部署时将自动转换为 Node.js Runtime');
|
||||
return true;
|
||||
} else {
|
||||
console.error('❌ 跳过配置 API 缺少 Edge Runtime 配置!');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// 检查存储后端兼容性
|
||||
function checkStorageCompatibility() {
|
||||
console.log('\n🗄️ 检查存储后端兼容性...');
|
||||
|
||||
const storageFiles = [
|
||||
'../src/lib/localstorage.db.ts',
|
||||
'../src/lib/redis.db.ts',
|
||||
'../src/lib/d1.db.ts',
|
||||
'../src/lib/upstash.db.ts'
|
||||
];
|
||||
|
||||
for (const storageFile of storageFiles) {
|
||||
const filePath = path.join(__dirname, storageFile);
|
||||
if (fs.existsSync(filePath)) {
|
||||
const content = fs.readFileSync(filePath, 'utf8');
|
||||
|
||||
if (content.includes('getSkipConfig') &&
|
||||
content.includes('setSkipConfig') &&
|
||||
content.includes('getAllSkipConfigs') &&
|
||||
content.includes('deleteSkipConfig')) {
|
||||
console.log(` ✓ ${path.basename(storageFile)} - 支持跳过配置功能`);
|
||||
} else {
|
||||
console.log(` ⚠ ${path.basename(storageFile)} - 缺少跳过配置方法`);
|
||||
}
|
||||
} else {
|
||||
console.log(` ❌ ${path.basename(storageFile)} - 文件不存在`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 运行所有检查
|
||||
console.log('🧪 开始 Docker 部署兼容性测试...\n');
|
||||
|
||||
const edgeRuntimeCount = convertEdgeToNodeRuntime();
|
||||
const skipConfigsOK = checkSkipConfigsAPI();
|
||||
checkStorageCompatibility();
|
||||
|
||||
console.log('\n📋 测试总结:');
|
||||
console.log(` • 发现 ${edgeRuntimeCount} 个 Edge Runtime 配置`);
|
||||
console.log(` • 跳过配置 API: ${skipConfigsOK ? '✅ 兼容' : '❌ 有问题'}`);
|
||||
console.log(' • 所有存储后端都支持跳过配置功能');
|
||||
|
||||
console.log('\n🎯 结论:');
|
||||
if (skipConfigsOK && edgeRuntimeCount > 0) {
|
||||
console.log('✅ Docker 部署兼容性测试通过!');
|
||||
console.log(' - Cloudflare Pages: Edge Runtime ✓');
|
||||
console.log(' - Docker: Node.js Runtime (自动转换) ✓');
|
||||
console.log(' - 其他部署方式: 灵活支持 ✓');
|
||||
} else {
|
||||
console.log('❌ 发现兼容性问题，需要修复!');
|
||||
process.exit(1);
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/* eslint-disable @typescript-eslint/no-var-requires, no-console, unused-imports/no-unused-vars */
|
||||
|
||||
/**
|
||||
* MoonTV 版本管理脚本
|
||||
* 用于自动化版本号更新、CHANGELOG 生成和发布管理
|
||||
@@ -13,7 +15,7 @@ const { execSync } = require('child_process');
|
||||
const PACKAGE_JSON = path.join(__dirname, '../package.json');
|
||||
const VERSION_TXT = path.join(__dirname, '../VERSION.txt');
|
||||
const CHANGELOG_MD = path.join(__dirname, '../CHANGELOG.md');
|
||||
const README_MD = path.join(__dirname, '../README.md');
|
||||
const _README_MD = path.join(__dirname, '../README.md');
|
||||
|
||||
// 版本类型
|
||||
const VERSION_TYPES = {
|
||||
@@ -166,8 +168,8 @@ function updateChangelog(newVersion, type) {
|
||||
|
||||
#### Docker 部署
|
||||
\`\`\`bash
|
||||
docker pull ghcr.io/senshinya/moontv:v${newVersion}
|
||||
docker run -d --name moontv -p 3000:3000 --env PASSWORD=your_password ghcr.io/senshinya/moontv:v${newVersion}
|
||||
docker pull ghcr.io/katelya77/katelyatv:v${newVersion}
|
||||
docker run -d --name katelyatv -p 3000:3000 --env PASSWORD=your_password ghcr.io/katelya77/katelyatv:v${newVersion}
|
||||
\`\`\`
|
||||
|
||||
#### 环境变量更新
|
||||
@@ -177,10 +179,10 @@ docker run -d --name moontv -p 3000:3000 --env PASSWORD=your_password ghcr.io/se
|
||||
查看 [CHANGELOG.md](CHANGELOG.md) 了解详细的更新历史。
|
||||
|
||||
### 🔗 相关链接
|
||||
- [项目主页](https://github.com/senshinya/moontv)
|
||||
- [在线演示](https://moontv.vercel.app)
|
||||
- [问题反馈](https://github.com/senshinya/moontv/issues)
|
||||
- [功能建议](https://github.com/senshinya/moontv/discussions)
|
||||
- [项目主页](https://github.com/katelya77/KatelyaTV)
|
||||
- [在线演示](https://katelyatv.vercel.app)
|
||||
- [问题反馈](https://github.com/katelya77/KatelyaTV/issues)
|
||||
- [功能建议](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
|
||||
`;
|
||||
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
|
||||
import { getAuthInfoFromCookie } from '@/lib/auth';
|
||||
import { getStorage } from '@/lib/db';
|
||||
import { EpisodeSkipConfig } from '@/lib/types';
|
||||
|
||||
// 配置 Edge Runtime - Cloudflare Pages 要求
|
||||
export const runtime = 'edge';
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
const body = await request.json();
|
||||
const { action, key, config, username } = body;
|
||||
|
||||
// 验证请求参数
|
||||
if (!action) {
|
||||
return NextResponse.json({ error: '缺少操作类型' }, { status: 400 });
|
||||
}
|
||||
|
||||
// 获取认证信息
|
||||
const authInfo = getAuthInfoFromCookie(request);
|
||||
|
||||
// 如果是直接传入的认证信息（客户端模式），使用传入的信息
|
||||
const finalUsername = username || authInfo?.username;
|
||||
|
||||
if (!finalUsername) {
|
||||
return NextResponse.json({ error: '用户未登录' }, { status: 401 });
|
||||
}
|
||||
|
||||
// 创建存储实例
|
||||
const storage = getStorage();
|
||||
|
||||
switch (action) {
|
||||
case 'get': {
|
||||
if (!key) {
|
||||
return NextResponse.json({ error: '缺少配置键' }, { status: 400 });
|
||||
}
|
||||
|
||||
const skipConfig = await storage.getSkipConfig(finalUsername, key);
|
||||
return NextResponse.json({ config: skipConfig });
|
||||
}
|
||||
|
||||
case 'set': {
|
||||
if (!key || !config) {
|
||||
return NextResponse.json({ error: '缺少配置键或配置数据' }, { status: 400 });
|
||||
}
|
||||
|
||||
// 验证配置数据结构
|
||||
if (!config.source || !config.id || !config.title || !Array.isArray(config.segments)) {
|
||||
return NextResponse.json({ error: '配置数据格式错误' }, { status: 400 });
|
||||
}
|
||||
|
||||
// 验证片段数据
|
||||
for (const segment of config.segments) {
|
||||
if (
|
||||
typeof segment.start !== 'number' ||
|
||||
typeof segment.end !== 'number' ||
|
||||
segment.start >= segment.end ||
|
||||
!['opening', 'ending'].includes(segment.type)
|
||||
) {
|
||||
return NextResponse.json({ error: '片段数据格式错误' }, { status: 400 });
|
||||
}
|
||||
}
|
||||
|
||||
await storage.setSkipConfig(finalUsername, key, config as EpisodeSkipConfig);
|
||||
return NextResponse.json({ success: true });
|
||||
}
|
||||
|
||||
case 'getAll': {
|
||||
const allConfigs = await storage.getAllSkipConfigs(finalUsername);
|
||||
return NextResponse.json({ configs: allConfigs });
|
||||
}
|
||||
|
||||
case 'delete': {
|
||||
if (!key) {
|
||||
return NextResponse.json({ error: '缺少配置键' }, { status: 400 });
|
||||
}
|
||||
|
||||
await storage.deleteSkipConfig(finalUsername, key);
|
||||
return NextResponse.json({ success: true });
|
||||
}
|
||||
|
||||
default:
|
||||
return NextResponse.json({ error: '不支持的操作类型' }, { status: 400 });
|
||||
}
|
||||
} catch (error) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('跳过配置 API 错误:', error);
|
||||
return NextResponse.json(
|
||||
{ error: '服务器内部错误' },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
}
|
||||
+45
-2
@@ -23,6 +23,7 @@ import { getVideoResolutionFromM3u8, processImageUrl } from '@/lib/utils';
|
||||
|
||||
import EpisodeSelector from '@/components/EpisodeSelector';
|
||||
import PageLayout from '@/components/PageLayout';
|
||||
import SkipController, { SkipSettingsButton } from '@/components/SkipController';
|
||||
|
||||
// 扩展 HTMLVideoElement 类型以支持 hls 属性
|
||||
declare global {
|
||||
@@ -163,6 +164,13 @@ function PlayPageClient() {
|
||||
const saveIntervalRef = useRef<NodeJS.Timeout | null>(null);
|
||||
const lastSaveTimeRef = useRef<number>(0);
|
||||
|
||||
// 播放器时间状态（用于跳过功能）
|
||||
const [currentPlayTime, setCurrentPlayTime] = useState<number>(0);
|
||||
const [videoDuration, setVideoDuration] = useState<number>(0);
|
||||
|
||||
// 跳过设置状态
|
||||
const [isSkipSettingMode, setIsSkipSettingMode] = useState<boolean>(false);
|
||||
|
||||
const artPlayerRef = useRef<any>(null);
|
||||
const artRef = useRef<HTMLDivElement | null>(null);
|
||||
|
||||
@@ -1200,12 +1208,27 @@ function PlayPageClient() {
|
||||
// 监听播放器事件
|
||||
artPlayerRef.current.on('ready', () => {
|
||||
setError(null);
|
||||
// 更新视频时长
|
||||
const duration = artPlayerRef.current.duration || 0;
|
||||
setVideoDuration(duration);
|
||||
});
|
||||
|
||||
artPlayerRef.current.on('video:volumechange', () => {
|
||||
lastVolumeRef.current = artPlayerRef.current.volume;
|
||||
});
|
||||
|
||||
// 监听播放时间更新（用于跳过功能）
|
||||
artPlayerRef.current.on('video:timeupdate', () => {
|
||||
const currentTime = artPlayerRef.current.currentTime || 0;
|
||||
setCurrentPlayTime(currentTime);
|
||||
|
||||
// 同时更新时长（防止ready事件中获取不到）
|
||||
const duration = artPlayerRef.current.duration || 0;
|
||||
if (duration > 0 && videoDuration !== duration) {
|
||||
setVideoDuration(duration);
|
||||
}
|
||||
});
|
||||
|
||||
// 监听视频可播放事件，这时恢复播放进度更可靠
|
||||
artPlayerRef.current.on('video:canplay', () => {
|
||||
// 若存在需要恢复的播放进度，则跳转
|
||||
@@ -1458,8 +1481,8 @@ function PlayPageClient() {
|
||||
return (
|
||||
<PageLayout activePath='/play'>
|
||||
<div className='flex flex-col gap-3 py-4 px-5 lg:px-[3rem] 2xl:px-20'>
|
||||
{/* 第一行：影片标题 */}
|
||||
<div className='py-1'>
|
||||
{/* 第一行：影片标题和操作按钮 */}
|
||||
<div className='py-1 flex items-center justify-between'>
|
||||
<h1 className='text-xl font-semibold text-gray-900 dark:text-gray-100'>
|
||||
{videoTitle || '影片标题'}
|
||||
{totalEpisodes > 1 && (
|
||||
@@ -1468,6 +1491,11 @@ function PlayPageClient() {
|
||||
</span>
|
||||
)}
|
||||
</h1>
|
||||
|
||||
{/* 跳过设置按钮 */}
|
||||
{currentSource && currentId && (
|
||||
<SkipSettingsButton onClick={() => setIsSkipSettingMode(true)} />
|
||||
)}
|
||||
</div>
|
||||
{/* 第二行：播放器和选集 */}
|
||||
<div className='space-y-2'>
|
||||
@@ -1531,6 +1559,21 @@ function PlayPageClient() {
|
||||
className='bg-black w-full h-full rounded-xl overflow-hidden shadow-lg'
|
||||
></div>
|
||||
|
||||
{/* 跳过片头片尾控制器 */}
|
||||
{currentSource && currentId && videoTitle && (
|
||||
<SkipController
|
||||
source={currentSource}
|
||||
id={currentId}
|
||||
title={videoTitle}
|
||||
artPlayerRef={artPlayerRef}
|
||||
currentTime={currentPlayTime}
|
||||
duration={videoDuration}
|
||||
isSettingMode={isSkipSettingMode}
|
||||
onSettingModeChange={setIsSkipSettingMode}
|
||||
onNextEpisode={handleNextEpisode}
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* 换源加载蒙层 */}
|
||||
{isVideoLoading && (
|
||||
<div className='absolute inset-0 bg-black/85 backdrop-blur-sm rounded-xl flex items-center justify-center z-[500] transition-all duration-300'>
|
||||
|
||||
@@ -71,8 +71,10 @@ const TopNavbar = ({ activePath = '/' }: { activePath?: string }) => {
|
||||
},
|
||||
];
|
||||
|
||||
// 桌面端：顶部固定导航（fixed）
|
||||
// 移动端：不显示此组件，改由底部导航 + 轻量顶部条（非固定）
|
||||
return (
|
||||
<nav className='w-full bg-white/40 backdrop-blur-xl border-b border-purple-200/50 shadow-lg dark:bg-gray-900/70 dark:border-purple-700/50 sticky top-0 z-50'>
|
||||
<nav className='w-full bg-white/40 backdrop-blur-xl border-b border-purple-200/50 shadow-lg dark:bg-gray-900/70 dark:border-purple-700/50 fixed top-0 left-0 right-0 z-40 hidden md:block'>
|
||||
<div className='w-full px-8 lg:px-12 xl:px-16'>
|
||||
<div className='flex items-center justify-between h-16'>
|
||||
{/* Logo区域 - 调整为更靠左 */}
|
||||
@@ -164,64 +166,59 @@ const TopNavbar = ({ activePath = '/' }: { activePath?: string }) => {
|
||||
const PageLayout = ({ children, activePath = '/' }: PageLayoutProps) => {
|
||||
return (
|
||||
<div className='w-full min-h-screen'>
|
||||
{/* 移动端头部 */}
|
||||
{/* 移动端头部 (fixed) */}
|
||||
<MobileHeader showBackButton={['/play'].includes(activePath)} />
|
||||
|
||||
{/* 桌面端顶部导航栏 */}
|
||||
<div className='hidden md:block'>
|
||||
<TopNavbar activePath={activePath} />
|
||||
</div>
|
||||
{/* 桌面端顶部导航栏 (fixed) */}
|
||||
<TopNavbar activePath={activePath} />
|
||||
|
||||
{/* 主要布局容器 */}
|
||||
<div className='w-full min-h-screen md:min-h-auto'>
|
||||
{/* 主内容区域 */}
|
||||
<div className='relative min-w-0 flex-1 transition-all duration-300'>
|
||||
{/* 桌面端左上角返回按钮 */}
|
||||
{['/play'].includes(activePath) && (
|
||||
<div className='absolute top-3 left-1 z-20 hidden md:flex'>
|
||||
<BackButton />
|
||||
</div>
|
||||
)}
|
||||
{/* 主内容区域 - 预留桌面端顶部导航高度 64px */}
|
||||
<div className='relative min-w-0 transition-all duration-300 md:pt-16'>
|
||||
{/* 桌面端左上角返回按钮 */}
|
||||
{['/play'].includes(activePath) && (
|
||||
<div className='absolute top-3 left-1 z-20 hidden md:flex'>
|
||||
<BackButton />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 主内容容器 - 为播放页面使用特殊布局（83.33%宽度），其他页面使用默认布局（66.67%宽度） */}
|
||||
<main className='flex-1 md:min-h-0 mb-14 md:mb-0 md:p-6 lg:p-8'>
|
||||
{/* 使用flex布局实现宽度控制 */}
|
||||
<div className='flex w-full min-h-screen md:min-h-[calc(100vh-10rem)]'>
|
||||
{/* 左侧留白区域 - 播放页面占8.33%，其他页面占16.67% */}
|
||||
{/* 主内容容器 - 为播放页面使用特殊布局（83.33%宽度），其他页面使用默认布局（66.67%宽度） */}
|
||||
<main className='mb-14 md:mb-0 md:p-6 lg:p-8'>
|
||||
{/* 使用flex布局实现宽度控制 */}
|
||||
<div className='flex w-full min-h-[calc(100vh-4rem)]'>
|
||||
{/* 左侧留白区域 - 播放页面占8.33%，其他页面占16.67% */}
|
||||
<div
|
||||
className='hidden md:block flex-shrink-0'
|
||||
style={{
|
||||
width: ['/play'].includes(activePath) ? '8.33%' : '16.67%'
|
||||
}}
|
||||
></div>
|
||||
|
||||
{/* 主内容区 - 播放页面占83.33%，其他页面占66.67% */}
|
||||
<div
|
||||
className='flex-1 md:flex-none rounded-container w-full'
|
||||
style={{
|
||||
width: ['/play'].includes(activePath) ? '83.33%' : '66.67%'
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className='hidden md:block flex-shrink-0'
|
||||
style={{
|
||||
width: ['/play'].includes(activePath) ? '8.33%' : '16.67%'
|
||||
}}
|
||||
></div>
|
||||
|
||||
{/* 主内容区 - 播放页面占83.33%，其他页面占66.67% */}
|
||||
<div
|
||||
className='flex-1 md:flex-none rounded-container w-full'
|
||||
style={{
|
||||
width: ['/play'].includes(activePath) ? '83.33%' : '66.67%'
|
||||
className='p-4 md:p-8 lg:p-10'
|
||||
style={{
|
||||
paddingBottom: 'calc(3.5rem + env(safe-area-inset-bottom))',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className='p-4 md:p-8 lg:p-10'
|
||||
style={{
|
||||
paddingBottom: 'calc(3.5rem + env(safe-area-inset-bottom))',
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
{children}
|
||||
</div>
|
||||
|
||||
{/* 右侧留白区域 - 播放页面占8.33%，其他页面占16.67% */}
|
||||
<div
|
||||
className='hidden md:block flex-shrink-0'
|
||||
style={{
|
||||
width: ['/play'].includes(activePath) ? '8.33%' : '16.67%'
|
||||
}}
|
||||
></div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
{/* 右侧留白区域 - 播放页面占8.33%，其他页面占16.67% */}
|
||||
<div
|
||||
className='hidden md:block flex-shrink-0'
|
||||
style={{
|
||||
width: ['/play'].includes(activePath) ? '8.33%' : '16.67%'
|
||||
}}
|
||||
></div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
{/* 移动端底部导航 */}
|
||||
|
||||
@@ -0,0 +1,777 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any, no-console */
|
||||
'use client';
|
||||
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
|
||||
import {
|
||||
deleteSkipConfig,
|
||||
EpisodeSkipConfig,
|
||||
getSkipConfig,
|
||||
saveSkipConfig,
|
||||
SkipSegment,
|
||||
} from '@/lib/db.client';
|
||||
|
||||
interface SkipControllerProps {
|
||||
source: string;
|
||||
id: string;
|
||||
title: string;
|
||||
artPlayerRef: React.MutableRefObject<any>;
|
||||
currentTime?: number;
|
||||
duration?: number;
|
||||
isSettingMode?: boolean;
|
||||
onSettingModeChange?: (isOpen: boolean) => void;
|
||||
onNextEpisode?: () => void; // 新增：跳转下一集的回调
|
||||
}
|
||||
|
||||
export default function SkipController({
|
||||
source,
|
||||
id,
|
||||
title,
|
||||
artPlayerRef,
|
||||
currentTime = 0,
|
||||
duration = 0,
|
||||
isSettingMode = false,
|
||||
onSettingModeChange,
|
||||
onNextEpisode,
|
||||
}: SkipControllerProps) {
|
||||
const [skipConfig, setSkipConfig] = useState<EpisodeSkipConfig | null>(null);
|
||||
const [showSkipButton, setShowSkipButton] = useState(false);
|
||||
const [currentSkipSegment, setCurrentSkipSegment] = useState<SkipSegment | null>(null);
|
||||
const [newSegment, setNewSegment] = useState<Partial<SkipSegment>>({});
|
||||
|
||||
// 新增状态：批量设置模式 - 支持分:秒格式
|
||||
const [batchSettings, setBatchSettings] = useState({
|
||||
openingStart: '0:00', // 片头开始时间（分:秒格式）
|
||||
openingEnd: '1:30', // 片头结束时间（分:秒格式，90秒=1分30秒）
|
||||
endingStart: '20:00', // 片尾开始时间（分:秒格式）
|
||||
endingEnd: '', // 片尾结束时间（可选，空表示直接跳转下一集）
|
||||
autoSkip: true, // 自动跳过开关
|
||||
autoNextEpisode: true, // 自动下一集开关
|
||||
});
|
||||
const [showCountdown, setShowCountdown] = useState(false);
|
||||
const [countdownSeconds, setCountdownSeconds] = useState(0);
|
||||
|
||||
const lastSkipTimeRef = useRef<number>(0);
|
||||
const skipTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||
const autoSkipTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||
const countdownIntervalRef = useRef<NodeJS.Timeout | null>(null);
|
||||
|
||||
// 时间格式转换函数
|
||||
const timeToSeconds = useCallback((timeStr: string): number => {
|
||||
if (!timeStr || timeStr.trim() === '') return 0;
|
||||
|
||||
// 支持多种格式: "2:10", "2:10.5", "130", "130.5"
|
||||
if (timeStr.includes(':')) {
|
||||
const parts = timeStr.split(':');
|
||||
const minutes = parseInt(parts[0]) || 0;
|
||||
const seconds = parseFloat(parts[1]) || 0;
|
||||
return minutes * 60 + seconds;
|
||||
} else {
|
||||
return parseFloat(timeStr) || 0;
|
||||
}
|
||||
}, []);
|
||||
|
||||
const secondsToTime = useCallback((seconds: number): string => {
|
||||
const mins = Math.floor(seconds / 60);
|
||||
const secs = Math.floor(seconds % 60);
|
||||
const decimal = seconds % 1;
|
||||
if (decimal > 0) {
|
||||
return `${mins}:${secs.toString().padStart(2, '0')}.${Math.floor(decimal * 10)}`;
|
||||
}
|
||||
return `${mins}:${secs.toString().padStart(2, '0')}`;
|
||||
}, []);
|
||||
|
||||
// 加载跳过配置
|
||||
const loadSkipConfig = useCallback(async () => {
|
||||
try {
|
||||
const config = await getSkipConfig(source, id);
|
||||
setSkipConfig(config);
|
||||
} catch (err) {
|
||||
console.error('加载跳过配置失败:', err);
|
||||
}
|
||||
}, [source, id]);
|
||||
|
||||
// 自动跳过逻辑
|
||||
const handleAutoSkip = useCallback((segment: SkipSegment) => {
|
||||
if (!artPlayerRef.current) return;
|
||||
|
||||
const targetTime = segment.end + 1;
|
||||
artPlayerRef.current.currentTime = targetTime;
|
||||
lastSkipTimeRef.current = Date.now();
|
||||
|
||||
// 显示跳过提示
|
||||
if (artPlayerRef.current.notice) {
|
||||
const segmentName = segment.type === 'opening' ? '片头' : '片尾';
|
||||
artPlayerRef.current.notice.show = `自动跳过${segmentName}`;
|
||||
}
|
||||
|
||||
setCurrentSkipSegment(null);
|
||||
}, [artPlayerRef]);
|
||||
|
||||
// 开始片尾倒计时
|
||||
const startEndingCountdown = useCallback((seconds: number) => {
|
||||
setShowCountdown(true);
|
||||
setCountdownSeconds(seconds);
|
||||
|
||||
if (countdownIntervalRef.current) {
|
||||
clearInterval(countdownIntervalRef.current);
|
||||
}
|
||||
|
||||
countdownIntervalRef.current = setInterval(() => {
|
||||
setCountdownSeconds(prev => {
|
||||
if (prev <= 1) {
|
||||
// 倒计时结束，跳转下一集
|
||||
if (onNextEpisode) {
|
||||
onNextEpisode();
|
||||
}
|
||||
setShowCountdown(false);
|
||||
if (countdownIntervalRef.current) {
|
||||
clearInterval(countdownIntervalRef.current);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return prev - 1;
|
||||
});
|
||||
}, 1000);
|
||||
}, [onNextEpisode]);
|
||||
|
||||
// 检查片尾倒计时
|
||||
const checkEndingCountdown = useCallback((time: number) => {
|
||||
if (!skipConfig?.segments?.length || !duration || !onNextEpisode) return;
|
||||
|
||||
const endingSegments = skipConfig.segments.filter(s => s.type === 'ending' && s.autoNextEpisode !== false);
|
||||
if (!endingSegments.length) return;
|
||||
|
||||
for (const segment of endingSegments) {
|
||||
const timeToEnd = duration - time;
|
||||
const timeToSegmentStart = duration - segment.start;
|
||||
|
||||
// 当距离视频结束的时间等于设定的片尾开始时间时，开始倒计时
|
||||
if (timeToEnd <= timeToSegmentStart && timeToEnd > 0 && !showCountdown) {
|
||||
startEndingCountdown(Math.ceil(timeToEnd));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}, [skipConfig, duration, onNextEpisode, showCountdown, startEndingCountdown]);
|
||||
|
||||
// 检查当前播放时间是否在跳过区间内
|
||||
const checkSkipSegment = useCallback(
|
||||
(time: number) => {
|
||||
if (!skipConfig?.segments?.length) return;
|
||||
|
||||
const currentSegment = skipConfig.segments.find(
|
||||
(segment) => time >= segment.start && time <= segment.end
|
||||
);
|
||||
|
||||
if (currentSegment && currentSegment !== currentSkipSegment) {
|
||||
setCurrentSkipSegment(currentSegment);
|
||||
|
||||
// 检查是否开启自动跳过
|
||||
const hasAutoSkipSetting = skipConfig.segments.some(s => s.autoSkip !== false);
|
||||
|
||||
if (hasAutoSkipSetting) {
|
||||
// 自动跳过：延迟1秒执行跳过
|
||||
if (autoSkipTimeoutRef.current) {
|
||||
clearTimeout(autoSkipTimeoutRef.current);
|
||||
}
|
||||
autoSkipTimeoutRef.current = setTimeout(() => {
|
||||
handleAutoSkip(currentSegment);
|
||||
}, 1000);
|
||||
|
||||
setShowSkipButton(false); // 自动跳过时不显示按钮
|
||||
} else {
|
||||
// 手动模式：显示跳过按钮
|
||||
setShowSkipButton(true);
|
||||
|
||||
// 自动隐藏跳过按钮
|
||||
if (skipTimeoutRef.current) {
|
||||
clearTimeout(skipTimeoutRef.current);
|
||||
}
|
||||
skipTimeoutRef.current = setTimeout(() => {
|
||||
setShowSkipButton(false);
|
||||
setCurrentSkipSegment(null);
|
||||
}, 8000);
|
||||
}
|
||||
} else if (!currentSegment && currentSkipSegment) {
|
||||
setCurrentSkipSegment(null);
|
||||
setShowSkipButton(false);
|
||||
if (skipTimeoutRef.current) {
|
||||
clearTimeout(skipTimeoutRef.current);
|
||||
}
|
||||
if (autoSkipTimeoutRef.current) {
|
||||
clearTimeout(autoSkipTimeoutRef.current);
|
||||
}
|
||||
}
|
||||
|
||||
// 检查片尾倒计时
|
||||
checkEndingCountdown(time);
|
||||
},
|
||||
[skipConfig, currentSkipSegment, handleAutoSkip, checkEndingCountdown]
|
||||
);
|
||||
|
||||
// 执行跳过
|
||||
const handleSkip = useCallback(() => {
|
||||
if (!currentSkipSegment || !artPlayerRef.current) return;
|
||||
|
||||
const targetTime = currentSkipSegment.end + 1; // 跳到片段结束后1秒
|
||||
artPlayerRef.current.currentTime = targetTime;
|
||||
lastSkipTimeRef.current = Date.now();
|
||||
|
||||
setShowSkipButton(false);
|
||||
setCurrentSkipSegment(null);
|
||||
|
||||
if (skipTimeoutRef.current) {
|
||||
clearTimeout(skipTimeoutRef.current);
|
||||
}
|
||||
|
||||
// 显示跳过提示
|
||||
if (artPlayerRef.current.notice) {
|
||||
const segmentName = currentSkipSegment.type === 'opening' ? '片头' : '片尾';
|
||||
artPlayerRef.current.notice.show = `已跳过${segmentName}`;
|
||||
}
|
||||
}, [currentSkipSegment, artPlayerRef]);
|
||||
|
||||
// 保存新的跳过片段（单个片段模式）
|
||||
const handleSaveSegment = useCallback(async () => {
|
||||
if (!newSegment.start || !newSegment.end || !newSegment.type) {
|
||||
alert('请填写完整的跳过片段信息');
|
||||
return;
|
||||
}
|
||||
|
||||
if (newSegment.start >= newSegment.end) {
|
||||
alert('开始时间必须小于结束时间');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const segment: SkipSegment = {
|
||||
start: newSegment.start,
|
||||
end: newSegment.end,
|
||||
type: newSegment.type as 'opening' | 'ending',
|
||||
title: newSegment.title || (newSegment.type === 'opening' ? '片头' : '片尾'),
|
||||
autoSkip: true, // 默认开启自动跳过
|
||||
autoNextEpisode: newSegment.type === 'ending', // 片尾默认开启自动下一集
|
||||
};
|
||||
|
||||
const updatedConfig: EpisodeSkipConfig = {
|
||||
source,
|
||||
id,
|
||||
title,
|
||||
segments: skipConfig?.segments ? [...skipConfig.segments, segment] : [segment],
|
||||
updated_time: Date.now(),
|
||||
};
|
||||
|
||||
await saveSkipConfig(source, id, updatedConfig);
|
||||
setSkipConfig(updatedConfig);
|
||||
onSettingModeChange?.(false);
|
||||
setNewSegment({});
|
||||
|
||||
alert('跳过片段已保存');
|
||||
} catch (err) {
|
||||
console.error('保存跳过片段失败:', err);
|
||||
alert('保存失败，请重试');
|
||||
}
|
||||
}, [newSegment, skipConfig, source, id, title, onSettingModeChange]);
|
||||
|
||||
// 保存批量设置的跳过配置
|
||||
const handleSaveBatchSettings = useCallback(async () => {
|
||||
const segments: SkipSegment[] = [];
|
||||
|
||||
// 添加片头设置
|
||||
if (batchSettings.openingStart && batchSettings.openingEnd) {
|
||||
const start = timeToSeconds(batchSettings.openingStart);
|
||||
const end = timeToSeconds(batchSettings.openingEnd);
|
||||
|
||||
if (start >= end) {
|
||||
alert('片头开始时间必须小于结束时间');
|
||||
return;
|
||||
}
|
||||
|
||||
segments.push({
|
||||
start,
|
||||
end,
|
||||
type: 'opening',
|
||||
title: '片头',
|
||||
autoSkip: batchSettings.autoSkip,
|
||||
});
|
||||
}
|
||||
|
||||
// 添加片尾设置
|
||||
if (batchSettings.endingStart) {
|
||||
const endingStartSeconds = timeToSeconds(batchSettings.endingStart);
|
||||
|
||||
// 如果没有设置结束时间，则直接跳转到下一集
|
||||
if (!batchSettings.endingEnd || batchSettings.endingEnd.trim() === '') {
|
||||
// 直接从指定时间跳转下一集
|
||||
segments.push({
|
||||
start: endingStartSeconds,
|
||||
end: duration, // 设置为视频总长度
|
||||
type: 'ending',
|
||||
title: '片尾跳转下一集',
|
||||
autoSkip: batchSettings.autoSkip,
|
||||
autoNextEpisode: batchSettings.autoNextEpisode,
|
||||
});
|
||||
} else {
|
||||
const endingEndSeconds = timeToSeconds(batchSettings.endingEnd);
|
||||
|
||||
if (endingStartSeconds >= endingEndSeconds) {
|
||||
alert('片尾开始时间必须小于结束时间');
|
||||
return;
|
||||
}
|
||||
|
||||
segments.push({
|
||||
start: endingStartSeconds,
|
||||
end: endingEndSeconds,
|
||||
type: 'ending',
|
||||
title: '片尾',
|
||||
autoSkip: batchSettings.autoSkip,
|
||||
autoNextEpisode: batchSettings.autoNextEpisode,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (segments.length === 0) {
|
||||
alert('请至少设置片头或片尾时间');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const updatedConfig: EpisodeSkipConfig = {
|
||||
source,
|
||||
id,
|
||||
title,
|
||||
segments,
|
||||
updated_time: Date.now(),
|
||||
};
|
||||
|
||||
await saveSkipConfig(source, id, updatedConfig);
|
||||
setSkipConfig(updatedConfig);
|
||||
onSettingModeChange?.(false);
|
||||
|
||||
// 重置批量设置
|
||||
setBatchSettings({
|
||||
openingStart: '0:00',
|
||||
openingEnd: '1:30',
|
||||
endingStart: '20:00',
|
||||
endingEnd: '',
|
||||
autoSkip: true,
|
||||
autoNextEpisode: true,
|
||||
});
|
||||
|
||||
alert('跳过配置已保存');
|
||||
} catch (err) {
|
||||
console.error('保存跳过配置失败:', err);
|
||||
alert('保存失败，请重试');
|
||||
}
|
||||
}, [batchSettings, duration, source, id, title, onSettingModeChange, timeToSeconds]);
|
||||
|
||||
// 删除跳过片段
|
||||
const handleDeleteSegment = useCallback(
|
||||
async (index: number) => {
|
||||
if (!skipConfig?.segments) return;
|
||||
|
||||
try {
|
||||
const updatedSegments = skipConfig.segments.filter((_, i) => i !== index);
|
||||
|
||||
if (updatedSegments.length === 0) {
|
||||
// 如果没有片段了，删除整个配置
|
||||
await deleteSkipConfig(source, id);
|
||||
setSkipConfig(null);
|
||||
} else {
|
||||
// 更新配置
|
||||
const updatedConfig: EpisodeSkipConfig = {
|
||||
...skipConfig,
|
||||
segments: updatedSegments,
|
||||
updated_time: Date.now(),
|
||||
};
|
||||
await saveSkipConfig(source, id, updatedConfig);
|
||||
setSkipConfig(updatedConfig);
|
||||
}
|
||||
|
||||
alert('跳过片段已删除');
|
||||
} catch (err) {
|
||||
console.error('删除跳过片段失败:', err);
|
||||
alert('删除失败，请重试');
|
||||
}
|
||||
},
|
||||
[skipConfig, source, id]
|
||||
);
|
||||
|
||||
// 格式化时间显示
|
||||
const formatTime = (seconds: number): string => {
|
||||
const mins = Math.floor(seconds / 60);
|
||||
const secs = Math.floor(seconds % 60);
|
||||
return `${mins}:${secs.toString().padStart(2, '0')}`;
|
||||
};
|
||||
|
||||
// 初始化加载配置
|
||||
useEffect(() => {
|
||||
loadSkipConfig();
|
||||
}, [loadSkipConfig]);
|
||||
|
||||
// 监听播放时间变化
|
||||
useEffect(() => {
|
||||
if (currentTime > 0) {
|
||||
checkSkipSegment(currentTime);
|
||||
}
|
||||
}, [currentTime, checkSkipSegment]);
|
||||
|
||||
// 清理定时器
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (skipTimeoutRef.current) {
|
||||
clearTimeout(skipTimeoutRef.current);
|
||||
}
|
||||
if (autoSkipTimeoutRef.current) {
|
||||
clearTimeout(autoSkipTimeoutRef.current);
|
||||
}
|
||||
if (countdownIntervalRef.current) {
|
||||
clearInterval(countdownIntervalRef.current);
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="skip-controller">
|
||||
{/* 倒计时显示 - 片尾自动跳转下一集 */}
|
||||
{showCountdown && (
|
||||
<div className="fixed top-20 left-1/2 transform -translate-x-1/2 z-50 bg-blue-600/90 text-white px-6 py-3 rounded-lg backdrop-blur-sm border border-white/20 shadow-lg animate-fade-in">
|
||||
<div className="flex items-center space-x-3">
|
||||
<svg className="w-5 h-5 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||
</svg>
|
||||
<span className="text-sm font-medium">
|
||||
{countdownSeconds}秒后自动播放下一集
|
||||
</span>
|
||||
<button
|
||||
onClick={() => {
|
||||
setShowCountdown(false);
|
||||
if (countdownIntervalRef.current) {
|
||||
clearInterval(countdownIntervalRef.current);
|
||||
}
|
||||
}}
|
||||
className="px-2 py-1 bg-white/20 hover:bg-white/30 rounded text-xs transition-colors"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 跳过按钮 */}
|
||||
{showSkipButton && currentSkipSegment && (
|
||||
<div className="fixed top-20 right-4 z-50 bg-black/80 text-white px-4 py-2 rounded-lg backdrop-blur-sm border border-white/20 shadow-lg animate-fade-in">
|
||||
<div className="flex items-center space-x-3">
|
||||
<span className="text-sm">
|
||||
{currentSkipSegment.type === 'opening' ? '检测到片头' : '检测到片尾'}
|
||||
</span>
|
||||
<button
|
||||
onClick={handleSkip}
|
||||
className="px-3 py-1 bg-green-600 hover:bg-green-700 rounded text-sm font-medium transition-colors"
|
||||
>
|
||||
跳过
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 设置模式面板 - 增强版批量设置 */}
|
||||
{isSettingMode && (
|
||||
<div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
|
||||
<div className="bg-white dark:bg-gray-800 rounded-lg p-6 w-full max-w-2xl max-h-[90vh] overflow-y-auto">
|
||||
<h3 className="text-lg font-semibold mb-4 text-gray-900 dark:text-gray-100">
|
||||
智能跳过设置
|
||||
</h3>
|
||||
|
||||
{/* 全局开关 */}
|
||||
<div className="bg-blue-50 dark:bg-blue-900/20 p-4 rounded-lg mb-6">
|
||||
<div className="flex items-center justify-between mb-2">
|
||||
<label className="flex items-center space-x-2">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={batchSettings.autoSkip}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, autoSkip: e.target.checked})}
|
||||
className="rounded"
|
||||
/>
|
||||
<span className="text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
启用自动跳过
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<label className="flex items-center space-x-2">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={batchSettings.autoNextEpisode}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, autoNextEpisode: e.target.checked})}
|
||||
className="rounded"
|
||||
/>
|
||||
<span className="text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
片尾自动播放下一集
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400 mt-2">
|
||||
开启后将自动跳过设定的片头片尾，无需手动点击
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
{/* 片头设置 */}
|
||||
<div className="space-y-4">
|
||||
<h4 className="font-medium text-gray-900 dark:text-gray-100 border-b pb-2">
|
||||
🎬 片头设置
|
||||
</h4>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
开始时间 (分:秒)
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={batchSettings.openingStart}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, openingStart: e.target.value})}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
placeholder="0:00"
|
||||
/>
|
||||
<p className="text-xs text-gray-500 mt-1">格式: 分:秒 (如 0:00)</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
结束时间 (分:秒)
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={batchSettings.openingEnd}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, openingEnd: e.target.value})}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
placeholder="1:30"
|
||||
/>
|
||||
<p className="text-xs text-gray-500 mt-1">格式: 分:秒 (如 1:30)</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 片尾设置 */}
|
||||
<div className="space-y-4">
|
||||
<h4 className="font-medium text-gray-900 dark:text-gray-100 border-b pb-2">
|
||||
🎭 片尾设置
|
||||
</h4>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
开始时间 (分:秒)
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={batchSettings.endingStart}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, endingStart: e.target.value})}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
placeholder="20:00"
|
||||
/>
|
||||
<p className="text-xs text-gray-500 mt-1">从此时间开始检测片尾</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
结束时间 (分:秒) - 可选
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={batchSettings.endingEnd}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, endingEnd: e.target.value})}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
placeholder="留空直接跳下一集"
|
||||
/>
|
||||
<p className="text-xs text-gray-500 mt-1">空白=直接跳下一集</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="mt-6 p-4 bg-gray-50 dark:bg-gray-700 rounded-lg">
|
||||
<div className="text-sm text-gray-600 dark:text-gray-400 space-y-1">
|
||||
<p><strong>当前播放时间:</strong> {secondsToTime(currentTime)}</p>
|
||||
{duration > 0 && (
|
||||
<p><strong>视频总长度:</strong> {secondsToTime(duration)}</p>
|
||||
)}
|
||||
<div className="text-xs mt-2 text-gray-500 space-y-1">
|
||||
<p>💡 <strong>片头示例:</strong> 从 0:00 自动跳到 1:30</p>
|
||||
<p>💡 <strong>片尾示例:</strong> 从 20:00 开始倒计时，自动跳下一集</p>
|
||||
<p>💡 支持格式: 1:30 (1分30秒) 或 90 (90秒)</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex space-x-3 mt-6">
|
||||
<button
|
||||
onClick={handleSaveBatchSettings}
|
||||
className="flex-1 px-4 py-2 bg-green-600 hover:bg-green-700 text-white rounded font-medium transition-colors"
|
||||
>
|
||||
保存智能配置
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
onSettingModeChange?.(false);
|
||||
setBatchSettings({
|
||||
openingStart: '0:00',
|
||||
openingEnd: '1:30',
|
||||
endingStart: '20:00',
|
||||
endingEnd: '',
|
||||
autoSkip: true,
|
||||
autoNextEpisode: true,
|
||||
});
|
||||
}}
|
||||
className="flex-1 px-4 py-2 bg-gray-500 hover:bg-gray-600 text-white rounded font-medium transition-colors"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* 分割线 */}
|
||||
<div className="my-6 border-t border-gray-200 dark:border-gray-600"></div>
|
||||
|
||||
{/* 传统单个设置模式 */}
|
||||
<details className="mb-4">
|
||||
<summary className="cursor-pointer text-sm font-medium text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200">
|
||||
高级设置：添加单个片段
|
||||
</summary>
|
||||
<div className="mt-4 space-y-4 pl-4 border-l-2 border-gray-200 dark:border-gray-600">
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
类型
|
||||
</label>
|
||||
<select
|
||||
value={newSegment.type || ''}
|
||||
onChange={(e) => setNewSegment({ ...newSegment, type: e.target.value as 'opening' | 'ending' })}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
>
|
||||
<option value="">选择类型</option>
|
||||
<option value="opening">片头</option>
|
||||
<option value="ending">片尾</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
开始时间 (秒)
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
value={newSegment.start || ''}
|
||||
onChange={(e) => setNewSegment({ ...newSegment, start: parseFloat(e.target.value) })}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
结束时间 (秒)
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
value={newSegment.end || ''}
|
||||
onChange={(e) => setNewSegment({ ...newSegment, end: parseFloat(e.target.value) })}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button
|
||||
onClick={handleSaveSegment}
|
||||
className="px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded text-sm font-medium transition-colors"
|
||||
>
|
||||
添加片段
|
||||
</button>
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 管理已有片段 - 优化布局避免重叠 */}
|
||||
{skipConfig && skipConfig.segments && skipConfig.segments.length > 0 && !isSettingMode && (
|
||||
<div className="fixed bottom-4 right-4 z-40 max-w-sm bg-white/95 dark:bg-gray-800/95 backdrop-blur-sm rounded-lg shadow-lg border border-gray-200 dark:border-gray-600 animate-fade-in">
|
||||
<div className="p-3">
|
||||
<h4 className="font-medium mb-2 text-gray-900 dark:text-gray-100 text-sm flex items-center">
|
||||
<svg className="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13 5l7 7-7 7M5 5l7 7-7 7" />
|
||||
</svg>
|
||||
跳过配置
|
||||
</h4>
|
||||
<div className="space-y-1">
|
||||
{skipConfig.segments.map((segment, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className="flex items-center justify-between p-2 bg-gray-50 dark:bg-gray-700 rounded text-xs"
|
||||
>
|
||||
<span className="text-gray-800 dark:text-gray-200 flex-1 mr-2">
|
||||
<span className="font-medium">
|
||||
{segment.type === 'opening' ? '🎬片头' : '🎭片尾'}
|
||||
</span>
|
||||
<br />
|
||||
<span className="text-gray-600 dark:text-gray-400">
|
||||
{formatTime(segment.start)} - {formatTime(segment.end)}
|
||||
</span>
|
||||
{segment.autoSkip && (
|
||||
<span className="ml-1 px-1 bg-green-100 dark:bg-green-900 text-green-600 dark:text-green-400 rounded text-xs">
|
||||
自动
|
||||
</span>
|
||||
)}
|
||||
</span>
|
||||
<button
|
||||
onClick={() => handleDeleteSegment(index)}
|
||||
className="px-1.5 py-0.5 bg-red-500 hover:bg-red-600 text-white rounded text-xs transition-colors flex-shrink-0"
|
||||
title="删除"
|
||||
>
|
||||
×
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<div className="mt-2 pt-2 border-t border-gray-200 dark:border-gray-600">
|
||||
<button
|
||||
onClick={() => onSettingModeChange?.(true)}
|
||||
className="w-full px-2 py-1 bg-blue-100 hover:bg-blue-200 dark:bg-blue-900 dark:hover:bg-blue-800 text-blue-700 dark:text-blue-300 rounded text-xs transition-colors"
|
||||
>
|
||||
修改配置
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<style jsx>{`
|
||||
@keyframes fade-in {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(-10px);
|
||||
}
|
||||
to {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
.animate-fade-in {
|
||||
animation: fade-in 0.3s ease-out;
|
||||
}
|
||||
`}</style>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// 导出跳过控制器的设置按钮组件
|
||||
export function SkipSettingsButton({ onClick }: { onClick: () => void }) {
|
||||
return (
|
||||
<button
|
||||
onClick={onClick}
|
||||
className="flex items-center space-x-1 px-3 py-1.5 bg-gray-100 hover:bg-gray-200 dark:bg-gray-700 dark:hover:bg-gray-600 rounded text-sm text-gray-700 dark:text-gray-300 transition-colors"
|
||||
title="设置跳过片头片尾"
|
||||
>
|
||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13 5l7 7-7 7M5 5l7 7-7 7" />
|
||||
</svg>
|
||||
<span>跳过设置</span>
|
||||
</button>
|
||||
);
|
||||
}
|
||||
+101
-1
@@ -1,7 +1,7 @@
|
||||
/* eslint-disable no-console, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
|
||||
// 搜索历史最大条数
|
||||
const SEARCH_HISTORY_LIMIT = 20;
|
||||
@@ -473,4 +473,104 @@ export class D1Storage implements IStorage {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
// 跳过配置相关
|
||||
async getSkipConfig(
|
||||
userName: string,
|
||||
key: string
|
||||
): Promise<EpisodeSkipConfig | null> {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
const result = await db
|
||||
.prepare('SELECT * FROM skip_configs WHERE username = ? AND key = ?')
|
||||
.bind(userName, key)
|
||||
.first<any>();
|
||||
|
||||
if (!result) return null;
|
||||
|
||||
return {
|
||||
source: result.source,
|
||||
id: result.video_id,
|
||||
title: result.title,
|
||||
segments: JSON.parse(result.segments),
|
||||
updated_time: result.updated_time,
|
||||
};
|
||||
} catch (err) {
|
||||
console.error('Failed to get skip config:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
async setSkipConfig(
|
||||
userName: string,
|
||||
key: string,
|
||||
config: EpisodeSkipConfig
|
||||
): Promise<void> {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
await db
|
||||
.prepare(
|
||||
`
|
||||
INSERT OR REPLACE INTO skip_configs
|
||||
(username, key, source, video_id, title, segments, updated_time)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||
`
|
||||
)
|
||||
.bind(
|
||||
userName,
|
||||
key,
|
||||
config.source,
|
||||
config.id,
|
||||
config.title,
|
||||
JSON.stringify(config.segments),
|
||||
config.updated_time
|
||||
)
|
||||
.run();
|
||||
} catch (err) {
|
||||
console.error('Failed to set skip config:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
async getAllSkipConfigs(
|
||||
userName: string
|
||||
): Promise<{ [key: string]: EpisodeSkipConfig }> {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
const result = await db
|
||||
.prepare('SELECT * FROM skip_configs WHERE username = ?')
|
||||
.bind(userName)
|
||||
.all<any>();
|
||||
|
||||
const configs: { [key: string]: EpisodeSkipConfig } = {};
|
||||
|
||||
for (const row of result.results) {
|
||||
configs[row.key] = {
|
||||
source: row.source,
|
||||
id: row.video_id,
|
||||
title: row.title,
|
||||
segments: JSON.parse(row.segments),
|
||||
updated_time: row.updated_time,
|
||||
};
|
||||
}
|
||||
|
||||
return configs;
|
||||
} catch (err) {
|
||||
console.error('Failed to get all skip configs:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
async deleteSkipConfig(userName: string, key: string): Promise<void> {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
await db
|
||||
.prepare('DELETE FROM skip_configs WHERE username = ? AND key = ?')
|
||||
.bind(userName, key)
|
||||
.run();
|
||||
} catch (err) {
|
||||
console.error('Failed to delete skip config:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,24 @@ export interface Favorite {
|
||||
search_title?: string;
|
||||
}
|
||||
|
||||
// ---- 片头片尾跳过配置类型 ----
|
||||
export interface SkipSegment {
|
||||
start: number; // 开始时间（秒）
|
||||
end: number; // 结束时间（秒）
|
||||
type: 'opening' | 'ending'; // 片头或片尾
|
||||
title?: string; // 可选的描述
|
||||
autoSkip?: boolean; // 是否自动跳过（默认true）
|
||||
autoNextEpisode?: boolean; // 片尾是否自动跳转下一集（默认true，仅对ending类型有效）
|
||||
}
|
||||
|
||||
export interface EpisodeSkipConfig {
|
||||
source: string; // 资源站标识
|
||||
id: string; // 剧集ID
|
||||
title: string; // 剧集标题
|
||||
segments: SkipSegment[]; // 跳过片段列表
|
||||
updated_time: number; // 最后更新时间
|
||||
}
|
||||
|
||||
// ---- 缓存数据结构 ----
|
||||
interface CacheData<T> {
|
||||
data: T;
|
||||
@@ -52,6 +70,7 @@ interface UserCacheStore {
|
||||
playRecords?: CacheData<Record<string, PlayRecord>>;
|
||||
favorites?: CacheData<Record<string, Favorite>>;
|
||||
searchHistory?: CacheData<string[]>;
|
||||
skipConfigs?: CacheData<Record<string, EpisodeSkipConfig>>;
|
||||
}
|
||||
|
||||
// ---- 常量 ----
|
||||
@@ -59,6 +78,7 @@ interface UserCacheStore {
|
||||
const PLAY_RECORDS_KEY = 'katelyatv_play_records';
|
||||
const FAVORITES_KEY = 'katelyatv_favorites';
|
||||
const SEARCH_HISTORY_KEY = 'katelyatv_search_history';
|
||||
const SKIP_CONFIGS_KEY = 'katelyatv_skip_configs';
|
||||
const LEGACY_PLAY_RECORDS_KEY = 'moontv_play_records';
|
||||
const LEGACY_FAVORITES_KEY = 'moontv_favorites';
|
||||
const LEGACY_SEARCH_HISTORY_KEY = 'moontv_search_history';
|
||||
@@ -253,6 +273,35 @@ class HybridCacheManager {
|
||||
this.saveUserCache(username, userCache);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取缓存的跳过配置
|
||||
*/
|
||||
getCachedSkipConfigs(): Record<string, EpisodeSkipConfig> | null {
|
||||
const username = this.getCurrentUsername();
|
||||
if (!username) return null;
|
||||
|
||||
const userCache = this.getUserCache(username);
|
||||
const cached = userCache.skipConfigs;
|
||||
|
||||
if (cached && this.isCacheValid(cached)) {
|
||||
return cached.data;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 缓存跳过配置
|
||||
*/
|
||||
cacheSkipConfigs(data: Record<string, EpisodeSkipConfig>): void {
|
||||
const username = this.getCurrentUsername();
|
||||
if (!username) return;
|
||||
|
||||
const userCache = this.getUserCache(username);
|
||||
userCache.skipConfigs = this.createCacheData(data);
|
||||
this.saveUserCache(username, userCache);
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除指定用户的所有缓存
|
||||
*/
|
||||
@@ -1255,3 +1304,244 @@ export async function preloadUserData(): Promise<void> {
|
||||
console.warn('预加载用户数据失败:', err);
|
||||
});
|
||||
}
|
||||
|
||||
// ---------------- 片头片尾跳过配置管理 ----------------
|
||||
|
||||
/**
|
||||
* 生成跳过配置的存储 key
|
||||
*/
|
||||
export function generateSkipConfigKey(source: string, id: string): string {
|
||||
return `${source}_${id}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单个跳过配置
|
||||
*/
|
||||
export async function getSkipConfig(
|
||||
source: string,
|
||||
id: string
|
||||
): Promise<EpisodeSkipConfig | null> {
|
||||
try {
|
||||
const key = generateSkipConfigKey(source, id);
|
||||
|
||||
if (STORAGE_TYPE === 'localstorage') {
|
||||
// localStorage 模式
|
||||
const allConfigs = JSON.parse(
|
||||
localStorage.getItem(SKIP_CONFIGS_KEY) || '{}'
|
||||
);
|
||||
return allConfigs[key] || null;
|
||||
} else {
|
||||
// 数据库模式：先查缓存
|
||||
const cacheManager = HybridCacheManager.getInstance();
|
||||
const cachedConfigs = cacheManager.getCachedSkipConfigs();
|
||||
|
||||
if (cachedConfigs && cachedConfigs[key]) {
|
||||
return cachedConfigs[key];
|
||||
}
|
||||
|
||||
// 缓存未命中，从服务器获取
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
if (!authInfo?.username) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const response = await fetch('/api/skip-configs', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
action: 'get',
|
||||
key,
|
||||
username: authInfo.username,
|
||||
signature: authInfo.signature,
|
||||
timestamp: authInfo.timestamp,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
const config = data.config;
|
||||
|
||||
// 更新缓存
|
||||
if (config) {
|
||||
const allConfigs = cachedConfigs || {};
|
||||
allConfigs[key] = config;
|
||||
cacheManager.cacheSkipConfigs(allConfigs);
|
||||
}
|
||||
|
||||
return config;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('获取跳过配置失败:', err);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存跳过配置
|
||||
*/
|
||||
export async function saveSkipConfig(
|
||||
source: string,
|
||||
id: string,
|
||||
config: EpisodeSkipConfig
|
||||
): Promise<void> {
|
||||
try {
|
||||
const key = generateSkipConfigKey(source, id);
|
||||
|
||||
if (STORAGE_TYPE === 'localstorage') {
|
||||
// localStorage 模式
|
||||
const allConfigs = JSON.parse(
|
||||
localStorage.getItem(SKIP_CONFIGS_KEY) || '{}'
|
||||
);
|
||||
allConfigs[key] = config;
|
||||
localStorage.setItem(SKIP_CONFIGS_KEY, JSON.stringify(allConfigs));
|
||||
} else {
|
||||
// 数据库模式
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
if (!authInfo?.username) {
|
||||
throw new Error('用户未登录');
|
||||
}
|
||||
|
||||
const response = await fetch('/api/skip-configs', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
action: 'set',
|
||||
key,
|
||||
config,
|
||||
username: authInfo.username,
|
||||
signature: authInfo.signature,
|
||||
timestamp: authInfo.timestamp,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('保存跳过配置失败');
|
||||
}
|
||||
|
||||
// 更新缓存
|
||||
const cacheManager = HybridCacheManager.getInstance();
|
||||
const cachedConfigs = cacheManager.getCachedSkipConfigs() || {};
|
||||
cachedConfigs[key] = config;
|
||||
cacheManager.cacheSkipConfigs(cachedConfigs);
|
||||
}
|
||||
|
||||
console.log('跳过配置已保存:', key);
|
||||
} catch (err) {
|
||||
console.error('保存跳过配置失败:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有跳过配置
|
||||
*/
|
||||
export async function getAllSkipConfigs(): Promise<Record<string, EpisodeSkipConfig>> {
|
||||
try {
|
||||
if (STORAGE_TYPE === 'localstorage') {
|
||||
// localStorage 模式
|
||||
return JSON.parse(localStorage.getItem(SKIP_CONFIGS_KEY) || '{}');
|
||||
} else {
|
||||
// 数据库模式：先查缓存
|
||||
const cacheManager = HybridCacheManager.getInstance();
|
||||
const cachedConfigs = cacheManager.getCachedSkipConfigs();
|
||||
|
||||
if (cachedConfigs) {
|
||||
return cachedConfigs;
|
||||
}
|
||||
|
||||
// 缓存未命中，从服务器获取
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
if (!authInfo?.username) {
|
||||
return {};
|
||||
}
|
||||
|
||||
const response = await fetch('/api/skip-configs', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
action: 'getAll',
|
||||
username: authInfo.username,
|
||||
signature: authInfo.signature,
|
||||
timestamp: authInfo.timestamp,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
return {};
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
const configs = data.configs || {};
|
||||
|
||||
// 更新缓存
|
||||
cacheManager.cacheSkipConfigs(configs);
|
||||
|
||||
return configs;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('获取所有跳过配置失败:', err);
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除跳过配置
|
||||
*/
|
||||
export async function deleteSkipConfig(source: string, id: string): Promise<void> {
|
||||
try {
|
||||
const key = generateSkipConfigKey(source, id);
|
||||
|
||||
if (STORAGE_TYPE === 'localstorage') {
|
||||
// localStorage 模式
|
||||
const allConfigs = JSON.parse(
|
||||
localStorage.getItem(SKIP_CONFIGS_KEY) || '{}'
|
||||
);
|
||||
delete allConfigs[key];
|
||||
localStorage.setItem(SKIP_CONFIGS_KEY, JSON.stringify(allConfigs));
|
||||
} else {
|
||||
// 数据库模式
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
if (!authInfo?.username) {
|
||||
throw new Error('用户未登录');
|
||||
}
|
||||
|
||||
const response = await fetch('/api/skip-configs', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
action: 'delete',
|
||||
key,
|
||||
username: authInfo.username,
|
||||
signature: authInfo.signature,
|
||||
timestamp: authInfo.timestamp,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('删除跳过配置失败');
|
||||
}
|
||||
|
||||
// 更新缓存
|
||||
const cacheManager = HybridCacheManager.getInstance();
|
||||
const cachedConfigs = cacheManager.getCachedSkipConfigs() || {};
|
||||
delete cachedConfigs[key];
|
||||
cacheManager.cacheSkipConfigs(cachedConfigs);
|
||||
}
|
||||
|
||||
console.log('跳过配置已删除:', key);
|
||||
} catch (err) {
|
||||
console.error('删除跳过配置失败:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
+42
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { D1Storage } from './d1.db';
|
||||
import { LocalStorage } from './localstorage.db';
|
||||
import { RedisStorage } from './redis.db';
|
||||
import { Favorite, IStorage, PlayRecord } from './types';
|
||||
import { UpstashRedisStorage } from './upstash.db';
|
||||
@@ -26,8 +27,8 @@ function createStorage(): IStorage {
|
||||
return new D1Storage();
|
||||
case 'localstorage':
|
||||
default:
|
||||
// 默认返回内存实现，保证本地开发可用
|
||||
return null as unknown as IStorage;
|
||||
// 使用 LocalStorage 实现，适用于本地开发和简单部署
|
||||
return new LocalStorage();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,6 +182,45 @@ export class DbManager {
|
||||
await (this.storage as any).setAdminConfig(config);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 跳过配置 ----------
|
||||
async getSkipConfig(
|
||||
userName: string,
|
||||
key: string
|
||||
): Promise<any> {
|
||||
if (typeof (this.storage as any).getSkipConfig === 'function') {
|
||||
return (this.storage as any).getSkipConfig(userName, key);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async saveSkipConfig(
|
||||
userName: string,
|
||||
key: string,
|
||||
config: any
|
||||
): Promise<void> {
|
||||
if (typeof (this.storage as any).setSkipConfig === 'function') {
|
||||
await (this.storage as any).setSkipConfig(userName, key, config);
|
||||
}
|
||||
}
|
||||
|
||||
async getAllSkipConfigs(
|
||||
userName: string
|
||||
): Promise<{ [key: string]: any }> {
|
||||
if (typeof (this.storage as any).getAllSkipConfigs === 'function') {
|
||||
return (this.storage as any).getAllSkipConfigs(userName);
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
async deleteSkipConfig(
|
||||
userName: string,
|
||||
key: string
|
||||
): Promise<void> {
|
||||
if (typeof (this.storage as any).deleteSkipConfig === 'function') {
|
||||
await (this.storage as any).deleteSkipConfig(userName, key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 导出默认实例
|
||||
|
||||
@@ -0,0 +1,388 @@
|
||||
/* eslint-disable no-console */
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
|
||||
/**
|
||||
* LocalStorage 存储实现
|
||||
* 主要用于本地开发和简单部署场景
|
||||
*/
|
||||
export class LocalStorage implements IStorage {
|
||||
private getStorageKey(prefix: string, userName: string, key?: string): string {
|
||||
if (key) {
|
||||
return `katelyatv_${prefix}_${userName}_${key}`;
|
||||
}
|
||||
return `katelyatv_${prefix}_${userName}`;
|
||||
}
|
||||
|
||||
// ---------- 播放记录 ----------
|
||||
async getPlayRecord(userName: string, key: string): Promise<PlayRecord | null> {
|
||||
if (typeof window === 'undefined') return null;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('playrecord', userName, key);
|
||||
const data = localStorage.getItem(storageKey);
|
||||
return data ? JSON.parse(data) : null;
|
||||
} catch (error) {
|
||||
console.error('Error getting play record:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async setPlayRecord(userName: string, key: string, record: PlayRecord): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('playrecord', userName, key);
|
||||
localStorage.setItem(storageKey, JSON.stringify(record));
|
||||
} catch (error) {
|
||||
console.error('Error setting play record:', error);
|
||||
}
|
||||
}
|
||||
|
||||
async getAllPlayRecords(userName: string): Promise<{ [key: string]: PlayRecord }> {
|
||||
if (typeof window === 'undefined') return {};
|
||||
|
||||
try {
|
||||
const prefix = this.getStorageKey('playrecord', userName);
|
||||
const records: { [key: string]: PlayRecord } = {};
|
||||
|
||||
for (let i = 0; i < localStorage.length; i++) {
|
||||
const storageKey = localStorage.key(i);
|
||||
if (storageKey && storageKey.startsWith(prefix + '_')) {
|
||||
const key = storageKey.replace(prefix + '_', '');
|
||||
const data = localStorage.getItem(storageKey);
|
||||
if (data) {
|
||||
records[key] = JSON.parse(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return records;
|
||||
} catch (error) {
|
||||
console.error('Error getting all play records:', error);
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
async deletePlayRecord(userName: string, key: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('playrecord', userName, key);
|
||||
localStorage.removeItem(storageKey);
|
||||
} catch (error) {
|
||||
console.error('Error deleting play record:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 收藏 ----------
|
||||
async getFavorite(userName: string, key: string): Promise<Favorite | null> {
|
||||
if (typeof window === 'undefined') return null;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('favorite', userName, key);
|
||||
const data = localStorage.getItem(storageKey);
|
||||
return data ? JSON.parse(data) : null;
|
||||
} catch (error) {
|
||||
console.error('Error getting favorite:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async setFavorite(userName: string, key: string, favorite: Favorite): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('favorite', userName, key);
|
||||
localStorage.setItem(storageKey, JSON.stringify(favorite));
|
||||
} catch (error) {
|
||||
console.error('Error setting favorite:', error);
|
||||
}
|
||||
}
|
||||
|
||||
async getAllFavorites(userName: string): Promise<{ [key: string]: Favorite }> {
|
||||
if (typeof window === 'undefined') return {};
|
||||
|
||||
try {
|
||||
const prefix = this.getStorageKey('favorite', userName);
|
||||
const favorites: { [key: string]: Favorite } = {};
|
||||
|
||||
for (let i = 0; i < localStorage.length; i++) {
|
||||
const storageKey = localStorage.key(i);
|
||||
if (storageKey && storageKey.startsWith(prefix + '_')) {
|
||||
const key = storageKey.replace(prefix + '_', '');
|
||||
const data = localStorage.getItem(storageKey);
|
||||
if (data) {
|
||||
favorites[key] = JSON.parse(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return favorites;
|
||||
} catch (error) {
|
||||
console.error('Error getting all favorites:', error);
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
async deleteFavorite(userName: string, key: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('favorite', userName, key);
|
||||
localStorage.removeItem(storageKey);
|
||||
} catch (error) {
|
||||
console.error('Error deleting favorite:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 用户管理 ----------
|
||||
async registerUser(userName: string, password: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('user', userName);
|
||||
const userData = { password, createdAt: new Date().toISOString() };
|
||||
localStorage.setItem(storageKey, JSON.stringify(userData));
|
||||
} catch (error) {
|
||||
console.error('Error registering user:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async verifyUser(userName: string, password: string): Promise<boolean> {
|
||||
if (typeof window === 'undefined') return false;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('user', userName);
|
||||
const data = localStorage.getItem(storageKey);
|
||||
if (!data) return false;
|
||||
|
||||
const userData = JSON.parse(data);
|
||||
return userData.password === password;
|
||||
} catch (error) {
|
||||
console.error('Error verifying user:', error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async checkUserExist(userName: string): Promise<boolean> {
|
||||
if (typeof window === 'undefined') return false;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('user', userName);
|
||||
return localStorage.getItem(storageKey) !== null;
|
||||
} catch (error) {
|
||||
console.error('Error checking user existence:', error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 搜索历史 ----------
|
||||
async getSearchHistory(userName: string): Promise<string[]> {
|
||||
if (typeof window === 'undefined') return [];
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('searchhistory', userName);
|
||||
const data = localStorage.getItem(storageKey);
|
||||
return data ? JSON.parse(data) : [];
|
||||
} catch (error) {
|
||||
console.error('Error getting search history:', error);
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
async addSearchHistory(userName: string, keyword: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const history = await this.getSearchHistory(userName);
|
||||
// 移除重复项并添加到开头
|
||||
const newHistory = [keyword, ...history.filter(item => item !== keyword)];
|
||||
// 限制历史记录数量
|
||||
const limitedHistory = newHistory.slice(0, 50);
|
||||
|
||||
const storageKey = this.getStorageKey('searchhistory', userName);
|
||||
localStorage.setItem(storageKey, JSON.stringify(limitedHistory));
|
||||
} catch (error) {
|
||||
console.error('Error adding search history:', error);
|
||||
}
|
||||
}
|
||||
|
||||
async deleteSearchHistory(userName: string, keyword?: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('searchhistory', userName);
|
||||
|
||||
if (!keyword) {
|
||||
// 删除所有搜索历史
|
||||
localStorage.removeItem(storageKey);
|
||||
} else {
|
||||
// 删除特定搜索历史
|
||||
const history = await this.getSearchHistory(userName);
|
||||
const newHistory = history.filter(item => item !== keyword);
|
||||
localStorage.setItem(storageKey, JSON.stringify(newHistory));
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error deleting search history:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 跳过配置 ----------
|
||||
async getSkipConfig(userName: string, key: string): Promise<EpisodeSkipConfig | null> {
|
||||
if (typeof window === 'undefined') return null;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('skipconfig', userName, key);
|
||||
const data = localStorage.getItem(storageKey);
|
||||
return data ? JSON.parse(data) : null;
|
||||
} catch (error) {
|
||||
console.error('Error getting skip config:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async setSkipConfig(userName: string, key: string, config: EpisodeSkipConfig): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('skipconfig', userName, key);
|
||||
localStorage.setItem(storageKey, JSON.stringify(config));
|
||||
} catch (error) {
|
||||
console.error('Error setting skip config:', error);
|
||||
}
|
||||
}
|
||||
|
||||
async getAllSkipConfigs(userName: string): Promise<{ [key: string]: EpisodeSkipConfig }> {
|
||||
if (typeof window === 'undefined') return {};
|
||||
|
||||
try {
|
||||
const prefix = this.getStorageKey('skipconfig', userName);
|
||||
const configs: { [key: string]: EpisodeSkipConfig } = {};
|
||||
|
||||
for (let i = 0; i < localStorage.length; i++) {
|
||||
const storageKey = localStorage.key(i);
|
||||
if (storageKey && storageKey.startsWith(prefix + '_')) {
|
||||
const key = storageKey.replace(prefix + '_', '');
|
||||
const data = localStorage.getItem(storageKey);
|
||||
if (data) {
|
||||
configs[key] = JSON.parse(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return configs;
|
||||
} catch (error) {
|
||||
console.error('Error getting all skip configs:', error);
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
async deleteSkipConfig(userName: string, key: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('skipconfig', userName, key);
|
||||
localStorage.removeItem(storageKey);
|
||||
} catch (error) {
|
||||
console.error('Error deleting skip config:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 管理员功能 ----------
|
||||
async getAllUsers(): Promise<string[]> {
|
||||
if (typeof window === 'undefined') return [];
|
||||
|
||||
try {
|
||||
const users: string[] = [];
|
||||
const prefix = 'katelyatv_user_';
|
||||
|
||||
for (let i = 0; i < localStorage.length; i++) {
|
||||
const storageKey = localStorage.key(i);
|
||||
if (storageKey && storageKey.startsWith(prefix)) {
|
||||
const userName = storageKey.replace(prefix, '');
|
||||
users.push(userName);
|
||||
}
|
||||
}
|
||||
|
||||
return users;
|
||||
} catch (error) {
|
||||
console.error('Error getting all users:', error);
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
async getAdminConfig(): Promise<AdminConfig | null> {
|
||||
if (typeof window === 'undefined') return null;
|
||||
|
||||
try {
|
||||
const data = localStorage.getItem('katelyatv_admin_config');
|
||||
return data ? JSON.parse(data) : null;
|
||||
} catch (error) {
|
||||
console.error('Error getting admin config:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async setAdminConfig(config: AdminConfig): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
localStorage.setItem('katelyatv_admin_config', JSON.stringify(config));
|
||||
} catch (error) {
|
||||
console.error('Error setting admin config:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 用户管理（管理员功能）----------
|
||||
async changePassword(userName: string, newPassword: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('user', userName);
|
||||
const data = localStorage.getItem(storageKey);
|
||||
if (!data) {
|
||||
throw new Error('用户不存在');
|
||||
}
|
||||
|
||||
const userData = JSON.parse(data);
|
||||
userData.password = newPassword;
|
||||
userData.updatedAt = new Date().toISOString();
|
||||
localStorage.setItem(storageKey, JSON.stringify(userData));
|
||||
} catch (error) {
|
||||
console.error('Error changing password:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async deleteUser(userName: string): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
// 删除用户账号
|
||||
const userKey = this.getStorageKey('user', userName);
|
||||
localStorage.removeItem(userKey);
|
||||
|
||||
// 删除用户相关的所有数据
|
||||
const prefixes = ['playrecord', 'favorite', 'searchhistory', 'skipconfig'];
|
||||
|
||||
for (const prefix of prefixes) {
|
||||
const dataPrefix = this.getStorageKey(prefix, userName);
|
||||
const keysToRemove: string[] = [];
|
||||
|
||||
for (let i = 0; i < localStorage.length; i++) {
|
||||
const storageKey = localStorage.key(i);
|
||||
if (storageKey && (storageKey === dataPrefix || storageKey.startsWith(dataPrefix + '_'))) {
|
||||
keysToRemove.push(storageKey);
|
||||
}
|
||||
}
|
||||
|
||||
keysToRemove.forEach(key => localStorage.removeItem(key));
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error deleting user:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
+66
-1
@@ -3,7 +3,7 @@
|
||||
import { createClient, RedisClientType } from 'redis';
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
|
||||
// 搜索历史最大条数
|
||||
const SEARCH_HISTORY_LIMIT = 20;
|
||||
@@ -283,6 +283,71 @@ export class RedisStorage implements IStorage {
|
||||
this.client.set(this.adminConfigKey(), JSON.stringify(config))
|
||||
);
|
||||
}
|
||||
|
||||
// 跳过配置相关
|
||||
private skipConfigKey(userName: string, key: string): string {
|
||||
return `katelyatv:skip_config:${userName}:${key}`;
|
||||
}
|
||||
|
||||
private skipConfigsKey(userName: string): string {
|
||||
return `katelyatv:skip_configs:${userName}`;
|
||||
}
|
||||
|
||||
async getSkipConfig(
|
||||
userName: string,
|
||||
key: string
|
||||
): Promise<EpisodeSkipConfig | null> {
|
||||
const data = await withRetry(() =>
|
||||
this.client.get(this.skipConfigKey(userName, key))
|
||||
);
|
||||
return data ? JSON.parse(data) : null;
|
||||
}
|
||||
|
||||
async setSkipConfig(
|
||||
userName: string,
|
||||
key: string,
|
||||
config: EpisodeSkipConfig
|
||||
): Promise<void> {
|
||||
await withRetry(async () => {
|
||||
// 保存到独立的key
|
||||
await this.client.set(
|
||||
this.skipConfigKey(userName, key),
|
||||
JSON.stringify(config)
|
||||
);
|
||||
// 同时加入到用户的跳过配置集合中
|
||||
await this.client.sAdd(this.skipConfigsKey(userName), key);
|
||||
});
|
||||
}
|
||||
|
||||
async getAllSkipConfigs(
|
||||
userName: string
|
||||
): Promise<{ [key: string]: EpisodeSkipConfig }> {
|
||||
const keys = await withRetry(() =>
|
||||
this.client.sMembers(this.skipConfigsKey(userName))
|
||||
);
|
||||
|
||||
const configs: { [key: string]: EpisodeSkipConfig } = {};
|
||||
|
||||
for (const key of keys) {
|
||||
const data = await withRetry(() =>
|
||||
this.client.get(this.skipConfigKey(userName, key))
|
||||
);
|
||||
if (data) {
|
||||
configs[key] = JSON.parse(data);
|
||||
}
|
||||
}
|
||||
|
||||
return configs;
|
||||
}
|
||||
|
||||
async deleteSkipConfig(userName: string, key: string): Promise<void> {
|
||||
await withRetry(async () => {
|
||||
// 删除独立的key
|
||||
await this.client.del(this.skipConfigKey(userName, key));
|
||||
// 从用户的跳过配置集合中移除
|
||||
await this.client.sRem(this.skipConfigsKey(userName), key);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 单例 Redis 客户端
|
||||
|
||||
@@ -14,6 +14,23 @@ export interface PlayRecord {
|
||||
search_title: string; // 搜索时使用的标题
|
||||
}
|
||||
|
||||
// 片头片尾数据结构
|
||||
export interface SkipSegment {
|
||||
start: number; // 开始时间（秒）
|
||||
end: number; // 结束时间（秒）
|
||||
type: 'opening' | 'ending'; // 片头或片尾
|
||||
title?: string; // 可选的描述
|
||||
}
|
||||
|
||||
// 剧集跳过配置
|
||||
export interface EpisodeSkipConfig {
|
||||
source: string; // 资源站标识
|
||||
id: string; // 剧集ID
|
||||
title: string; // 剧集标题
|
||||
segments: SkipSegment[]; // 跳过片段列表
|
||||
updated_time: number; // 最后更新时间
|
||||
}
|
||||
|
||||
// 收藏数据结构
|
||||
export interface Favorite {
|
||||
source_name: string;
|
||||
@@ -58,6 +75,12 @@ export interface IStorage {
|
||||
addSearchHistory(userName: string, keyword: string): Promise<void>;
|
||||
deleteSearchHistory(userName: string, keyword?: string): Promise<void>;
|
||||
|
||||
// 片头片尾跳过配置相关
|
||||
getSkipConfig(userName: string, key: string): Promise<EpisodeSkipConfig | null>;
|
||||
setSkipConfig(userName: string, key: string, config: EpisodeSkipConfig): Promise<void>;
|
||||
getAllSkipConfigs(userName: string): Promise<{ [key: string]: EpisodeSkipConfig }>;
|
||||
deleteSkipConfig(userName: string, key: string): Promise<void>;
|
||||
|
||||
// 用户列表
|
||||
getAllUsers(): Promise<string[]>;
|
||||
|
||||
|
||||
+63
-1
@@ -3,7 +3,7 @@
|
||||
import { Redis } from '@upstash/redis';
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
|
||||
// 搜索历史最大条数
|
||||
const SEARCH_HISTORY_LIMIT = 20;
|
||||
@@ -267,6 +267,68 @@ export class UpstashRedisStorage implements IStorage {
|
||||
async setAdminConfig(config: AdminConfig): Promise<void> {
|
||||
await withRetry(() => this.client.set(this.adminConfigKey(), config));
|
||||
}
|
||||
|
||||
// 跳过配置相关
|
||||
private skipConfigKey(userName: string, key: string): string {
|
||||
return `katelyatv:skip_config:${userName}:${key}`;
|
||||
}
|
||||
|
||||
private skipConfigsKey(userName: string): string {
|
||||
return `katelyatv:skip_configs:${userName}`;
|
||||
}
|
||||
|
||||
async getSkipConfig(
|
||||
userName: string,
|
||||
key: string
|
||||
): Promise<EpisodeSkipConfig | null> {
|
||||
const data = await withRetry(() =>
|
||||
this.client.get(this.skipConfigKey(userName, key))
|
||||
);
|
||||
return data ? (data as EpisodeSkipConfig) : null;
|
||||
}
|
||||
|
||||
async setSkipConfig(
|
||||
userName: string,
|
||||
key: string,
|
||||
config: EpisodeSkipConfig
|
||||
): Promise<void> {
|
||||
await withRetry(async () => {
|
||||
// 保存到独立的key
|
||||
await this.client.set(this.skipConfigKey(userName, key), config);
|
||||
// 同时加入到用户的跳过配置集合中
|
||||
await this.client.sadd(this.skipConfigsKey(userName), key);
|
||||
});
|
||||
}
|
||||
|
||||
async getAllSkipConfigs(
|
||||
userName: string
|
||||
): Promise<{ [key: string]: EpisodeSkipConfig }> {
|
||||
const keys = await withRetry(() =>
|
||||
this.client.smembers(this.skipConfigsKey(userName))
|
||||
);
|
||||
|
||||
const configs: { [key: string]: EpisodeSkipConfig } = {};
|
||||
|
||||
for (const key of ensureStringArray(keys || [])) {
|
||||
const data = await withRetry(() =>
|
||||
this.client.get(this.skipConfigKey(userName, key))
|
||||
);
|
||||
if (data) {
|
||||
configs[key] = data as EpisodeSkipConfig;
|
||||
}
|
||||
}
|
||||
|
||||
return configs;
|
||||
}
|
||||
|
||||
async deleteSkipConfig(userName: string, key: string): Promise<void> {
|
||||
await withRetry(async () => {
|
||||
// 删除独立的key
|
||||
await this.client.del(this.skipConfigKey(userName, key));
|
||||
// 从用户的跳过配置集合中移除
|
||||
await this.client.srem(this.skipConfigsKey(userName), key);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 单例 Upstash Redis 客户端
|
||||
|
||||
+4
-4
@@ -2,7 +2,7 @@
|
||||
|
||||
'use client';
|
||||
|
||||
const CURRENT_VERSION = '20250831153112';
|
||||
const CURRENT_VERSION = '20250902153459';
|
||||
|
||||
// 版本检查结果枚举
|
||||
export enum UpdateStatus {
|
||||
@@ -11,14 +11,14 @@ export enum UpdateStatus {
|
||||
FETCH_FAILED = 'fetch_failed', // 获取失败
|
||||
}
|
||||
|
||||
// 远程版本检查URL配置（支持环境变量覆盖，并保留 MoonTV 上游作为后备）
|
||||
// 远程版本检查URL配置（支持环境变量覆盖）
|
||||
const ENV_PRIMARY = process.env.NEXT_PUBLIC_VERSION_URL_PRIMARY;
|
||||
const ENV_BACKUP = process.env.NEXT_PUBLIC_VERSION_URL_BACKUP;
|
||||
const VERSION_CHECK_URLS = [
|
||||
ENV_PRIMARY,
|
||||
ENV_BACKUP,
|
||||
'https://ghfast.top/raw.githubusercontent.com/senshinya/MoonTV/main/VERSION.txt',
|
||||
'https://raw.githubusercontent.com/senshinya/MoonTV/main/VERSION.txt',
|
||||
'https://ghfast.top/raw.githubusercontent.com/katelya77/KatelyaTV/main/VERSION.txt',
|
||||
'https://raw.githubusercontent.com/katelya77/KatelyaTV/main/VERSION.txt',
|
||||
].filter(Boolean) as string[];
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user