Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d5443d97c9 | ||
|
|
2c8a68b064 |
No files matched your search
+5
-2
@@ -33,7 +33,9 @@ COPY . .
|
||||
RUN find ./src -type f -name "route.ts" -print0 \
|
||||
| xargs -0 sed -i "s/export const runtime = 'edge';/export const runtime = 'nodejs';/g"
|
||||
ENV DOCKER_ENV=true
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed97
|
||||
# 海报走站内 /api/image-proxy(浏览器直连豆瓣图被拦导致全裂)
|
||||
ENV NEXT_PUBLIC_IMAGE_PROXY=/api/image-proxy
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed105
|
||||
|
||||
# For Docker builds, force dynamic rendering to read runtime environment variables.
|
||||
RUN sed -i "/const inter = Inter({ subsets: \['latin'] });/a export const dynamic = 'force-dynamic';" src/app/layout.tsx
|
||||
@@ -52,7 +54,8 @@ ENV NODE_ENV=production
|
||||
ENV HOSTNAME=0.0.0.0
|
||||
ENV PORT=3000
|
||||
ENV DOCKER_ENV=true
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed97
|
||||
ENV NEXT_PUBLIC_IMAGE_PROXY=/api/image-proxy
|
||||
ENV NEXT_PUBLIC_SITE_VERSION=fixed105
|
||||
|
||||
# 从构建器中复制 standalone 输出
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
||||
|
||||
+78
-32
@@ -8,15 +8,21 @@ const H = {
|
||||
v6: 'https://tv6.88531.cn:4443',
|
||||
};
|
||||
|
||||
// 第一步:纯 IPv6 端点(仅 AAAA 记录),用于判断"客户端自己是否有 IPv6 出口"
|
||||
const IPV6_TEST = 'https://api6.ipify.org?format=json';
|
||||
// 第二步:我们自己的 IPv6 入口
|
||||
const URLS = [
|
||||
'https://tv6.88531.cn:4443/api/license-config?_=',
|
||||
'https://tv6.88531.cn/api/license-config?_=',
|
||||
];
|
||||
|
||||
type ProbeState = 'checking' | 'ok' | 'fail';
|
||||
type FailReason = 'no-ipv6' | 'entry' | 'unknown';
|
||||
|
||||
export default function IPv6Page() {
|
||||
const [state, setState] = useState<ProbeState>('checking');
|
||||
const [reason, setReason] = useState<FailReason>('unknown');
|
||||
const [detail, setDetail] = useState('');
|
||||
const [back, setBack] = useState('/');
|
||||
|
||||
useEffect(() => {
|
||||
@@ -35,6 +41,8 @@ export default function IPv6Page() {
|
||||
const cached = JSON.parse(localStorage.getItem('__v6probe') || 'null');
|
||||
if (cached && Date.now() - cached.t < 120000) {
|
||||
setState(cached.ok ? 'ok' : 'fail');
|
||||
setReason(cached.reason || 'unknown');
|
||||
setDetail(cached.detail || '');
|
||||
return;
|
||||
}
|
||||
} catch (e) { // ignore
|
||||
@@ -42,42 +50,50 @@ export default function IPv6Page() {
|
||||
}
|
||||
|
||||
let cancelled = false;
|
||||
|
||||
const fetchJson = (url: string, timeout = 5000) => {
|
||||
const c = new AbortController();
|
||||
const ti = setTimeout(() => c.abort(), timeout);
|
||||
return fetch(url, { mode: 'cors', signal: c.signal, cache: 'no-store', credentials: 'omit' })
|
||||
.then((r) => { clearTimeout(ti); return r.json(); })
|
||||
.catch((e) => { clearTimeout(ti); throw e; });
|
||||
};
|
||||
|
||||
const fail = (r: FailReason, d: string) => {
|
||||
if (cancelled) return;
|
||||
try { localStorage.setItem('__v6probe', JSON.stringify({ t: Date.now(), ok: false, reason: r, detail: d })); } catch (e) { /* ignore */ }
|
||||
setReason(r);
|
||||
setDetail(d);
|
||||
setState('fail');
|
||||
};
|
||||
|
||||
// 单一检测点:我们自己的 v6 入口(纯 IPv6,AAAA 记录)
|
||||
// 能通 ⇒ 客户端有 IPv6 出口且 v6 入口可达;不通 ⇒ 其中一方有问题
|
||||
let i = 0;
|
||||
const probe = () => {
|
||||
const probeEntry = () => {
|
||||
if (i >= URLS.length) {
|
||||
if (!cancelled) {
|
||||
try { localStorage.setItem('__v6probe', JSON.stringify({ t: Date.now(), ok: false })); } catch (e) { // ignore
|
||||
// ignore
|
||||
}
|
||||
setState('fail');
|
||||
}
|
||||
fail('entry', 'v6 入口 ' + URLS.join(' / ') + ' 全部失败:客户端没有可用的 IPv6 出口,或服务端 v6 入口被防火墙/运营商拦截。');
|
||||
return;
|
||||
}
|
||||
const c = new AbortController();
|
||||
const ti = setTimeout(() => c.abort(), 5000);
|
||||
fetch(URLS[i] + Date.now(), { mode: 'cors', signal: c.signal, cache: 'no-store', credentials: 'omit' })
|
||||
.then((r) => r.json())
|
||||
.then((j) => {
|
||||
clearTimeout(ti);
|
||||
fetchJson(URLS[i] + Date.now(), 5000)
|
||||
.then((jj) => {
|
||||
if (cancelled) return;
|
||||
if (j && j.code === 200 && j.data) {
|
||||
try { localStorage.setItem('__v6probe', JSON.stringify({ t: Date.now(), ok: true })); } catch (e) { // ignore
|
||||
// ignore
|
||||
}
|
||||
if (jj && jj.code === 200 && jj.data) {
|
||||
try { localStorage.setItem('__v6probe', JSON.stringify({ t: Date.now(), ok: true })); } catch (e) { /* ignore */ }
|
||||
setState('ok');
|
||||
} else {
|
||||
i++;
|
||||
probe();
|
||||
probeEntry();
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
clearTimeout(ti);
|
||||
.catch((e) => {
|
||||
if (cancelled) return;
|
||||
i++;
|
||||
probe();
|
||||
probeEntry();
|
||||
});
|
||||
};
|
||||
probe();
|
||||
probeEntry();
|
||||
|
||||
return () => { cancelled = true; };
|
||||
}, []);
|
||||
|
||||
@@ -91,6 +107,7 @@ export default function IPv6Page() {
|
||||
try { localStorage.setItem('__v6dest', which); } catch (e) { // ignore
|
||||
// ignore
|
||||
}
|
||||
document.cookie = `__v6dest=${which}; path=/; max-age=31536000; samesite=lax`;
|
||||
// 去掉 search 里的 back 参数,避免透传到目标地址
|
||||
const qs = new URLSearchParams(window.location.search);
|
||||
qs.delete('back');
|
||||
@@ -125,6 +142,7 @@ export default function IPv6Page() {
|
||||
try { localStorage.setItem('__v6dest', 'v6'); } catch (e) { // ignore
|
||||
// ignore
|
||||
}
|
||||
document.cookie = '__v6dest=v6; path=/; max-age=31536000; samesite=lax';
|
||||
let targetBack = back;
|
||||
try {
|
||||
const s = sessionStorage.getItem('__v6back');
|
||||
@@ -162,14 +180,35 @@ export default function IPv6Page() {
|
||||
<p style={{ color: 'rgba(255,255,255,.5)', marginBottom: 32 }}>选择访问线路</p>
|
||||
|
||||
{state === 'checking' && (
|
||||
<p style={{ color: 'rgba(255,255,255,.45)' }}>正在检测 IPv6…</p>
|
||||
<p style={{ color: 'rgba(255,255,255,.45)' }}>正在检测 IPv6(客户端出口 + v6 入口)…</p>
|
||||
)}
|
||||
|
||||
{state === 'ok' && (
|
||||
<div style={{ display: 'flex', gap: 16, flexWrap: 'wrap', justifyContent: 'center' }}>
|
||||
<button onClick={() => choose('v4')} style={btnStyle}>IPv4 线路</button>
|
||||
<button onClick={() => choose('v6')} style={btnStyle}>IPv6 线路</button>
|
||||
</div>
|
||||
<>
|
||||
<div style={{
|
||||
background: 'rgba(80,220,120,.10)',
|
||||
border: '1px solid rgba(80,220,120,.3)',
|
||||
borderRadius: 12,
|
||||
padding: '14px 20px',
|
||||
maxWidth: 520,
|
||||
textAlign: 'center',
|
||||
marginBottom: 24,
|
||||
}}>
|
||||
<p style={{ margin: 0, fontWeight: 600, color: '#7ef0a0' }}>✅ 检测到你的网络支持 IPv6</p>
|
||||
<p style={{ margin: '8px 0 0', color: 'rgba(255,255,255,.6)', fontSize: 13, lineHeight: 1.5 }}>
|
||||
推荐选择「IPv6 线路」,观影更流畅;如遇 IPv6 无法访问再切回 IPv4。
|
||||
</p>
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 16, flexWrap: 'wrap', justifyContent: 'center' }}>
|
||||
<button onClick={() => choose('v6')} style={{
|
||||
...btnStyle,
|
||||
background: 'rgba(80,220,120,.16)',
|
||||
border: '1px solid rgba(80,220,120,.55)',
|
||||
fontWeight: 600,
|
||||
}}>IPv6 线路(推荐)</button>
|
||||
<button onClick={() => choose('v4')} style={btnStyle}>IPv4 线路</button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{state === 'fail' && (
|
||||
@@ -179,13 +218,20 @@ export default function IPv6Page() {
|
||||
border: '1px solid rgba(255,180,0,.3)',
|
||||
borderRadius: 12,
|
||||
padding: '16px 20px',
|
||||
maxWidth: 480,
|
||||
textAlign: 'center',
|
||||
maxWidth: 520,
|
||||
textAlign: 'left',
|
||||
marginBottom: 24,
|
||||
}}>
|
||||
<p style={{ margin: 0, fontWeight: 600 }}>⚠️ 检测到你的网络不支持 IPv6 访问</p>
|
||||
<p style={{ margin: '8px 0 0', color: 'rgba(255,255,255,.6)', fontSize: 14 }}>
|
||||
已隐藏 IPv6 线路。请使用 IPv4 线路访问。
|
||||
<p style={{ margin: 0, fontWeight: 600 }}>
|
||||
{reason === 'no-ipv6' ? '⚠️ 你的浏览器/网络没有可用的 IPv6 出口' : '⚠️ 你的网络支持 IPv6,但我们的 v6 入口不可达'}
|
||||
</p>
|
||||
<p style={{ margin: '8px 0 0', color: 'rgba(255,255,255,.6)', fontSize: 13, lineHeight: 1.5, wordBreak: 'break-word' }}>
|
||||
{detail}
|
||||
</p>
|
||||
<p style={{ margin: '10px 0 0', color: 'rgba(255,255,255,.45)', fontSize: 12 }}>
|
||||
{reason === 'no-ipv6'
|
||||
? '常见原因:系统代理/VPN 只走 IPv4;路由器未分配 IPv6;浏览器禁用 IPv6。'
|
||||
: '常见原因:路由器/光猫 IPv6 防火墙拦截入向 4443;运营商阻断;或服务端 IPv6 地址已变更。'}
|
||||
</p>
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 12, flexWrap: 'wrap', justifyContent: 'center' }}>
|
||||
|
||||
+2
-2
@@ -8,7 +8,6 @@ import { getConfig } from '@/lib/config';
|
||||
|
||||
import { SiteProvider } from '../components/SiteProvider';
|
||||
import { ThemeProvider } from '../components/ThemeProvider';
|
||||
import Ipv6FirstVisitGate from '../components/Ipv6FirstVisitGate';
|
||||
|
||||
const inter = Inter({ subsets: ['latin'] });
|
||||
|
||||
@@ -115,7 +114,8 @@ export default async function RootLayout({
|
||||
disableTransitionOnChange
|
||||
>
|
||||
<SiteProvider siteName={siteName} announcement={announcement}>
|
||||
<Ipv6FirstVisitGate />
|
||||
{/* 首访不再强制跳 /ipv6(fixed105 移除 Ipv6FirstVisitGate):首页直接加载数据,
|
||||
IPv6 推荐改由首页 LineRecommender 非阻塞提示 */}
|
||||
{children}
|
||||
</SiteProvider>
|
||||
</ThemeProvider>
|
||||
|
||||
@@ -20,6 +20,7 @@ import { DoubanItem } from '@/lib/types';
|
||||
import CapsuleSwitch from '@/components/CapsuleSwitch';
|
||||
import ContinueWatching from '@/components/ContinueWatching';
|
||||
import HkDramaRow from '@/components/HkDramaRow';
|
||||
import LineRecommender from '@/components/LineRecommender';
|
||||
import PageLayout from '@/components/PageLayout';
|
||||
import PaginatedRow from '@/components/PaginatedRow';
|
||||
import VideoCard from '@/components/VideoCard';
|
||||
@@ -540,6 +541,7 @@ export default function Home() {
|
||||
return (
|
||||
<Suspense>
|
||||
<HomeClient />
|
||||
<LineRecommender />
|
||||
</Suspense>
|
||||
);
|
||||
}
|
||||
@@ -8,6 +8,8 @@ export default function Ipv6FirstVisitGate() {
|
||||
try {
|
||||
if (location.hostname !== 'tv.88531.cn') return; // 仅公网 IPv4 入口;LAN/IPv6 线路不跳转(避免循环)
|
||||
if (location.pathname === '/ipv6') return;
|
||||
// middleware 已记住线路(cookie)即视为已选择,不再重复弹
|
||||
if (/(^|;\s*)__v6dest=/.test(document.cookie)) return;
|
||||
if (localStorage.getItem('__v6dest')) return; // 已记住线路,不打扰
|
||||
sessionStorage.setItem('__v6back', location.pathname + location.search + location.hash);
|
||||
location.replace('/ipv6');
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
|
||||
const V6 = 'https://tv6.88531.cn:4443';
|
||||
const PROBE_URL = 'https://tv6.88531.cn:4443/api/license-config?_=';
|
||||
|
||||
// 首次访问的线路推荐:不阻塞数据加载,检测到支持 IPv6 时浮层提示用户可切换
|
||||
export default function LineRecommender() {
|
||||
const [show, setShow] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
try {
|
||||
// 已记住线路 / 不在 v6 入口 / 已提示过 → 不再弹
|
||||
if (window.location.hostname === 'tv6.88531.cn') return;
|
||||
if (localStorage.getItem('__v6dest')) return;
|
||||
if (localStorage.getItem('__v6hint')) return;
|
||||
|
||||
const cached = JSON.parse(localStorage.getItem('__v6probe') || 'null');
|
||||
if (cached && Date.now() - cached.t < 120000) {
|
||||
if (cached.ok) setShow(true);
|
||||
return;
|
||||
}
|
||||
|
||||
const c = new AbortController();
|
||||
const ti = setTimeout(() => c.abort(), 5000);
|
||||
fetch(PROBE_URL + Date.now(), { mode: 'cors', signal: c.signal, cache: 'no-store', credentials: 'omit' })
|
||||
.then((r) => { clearTimeout(ti); return r.json(); })
|
||||
.then((jj) => {
|
||||
const ok = !!(jj && jj.code === 200 && jj.data);
|
||||
try { localStorage.setItem('__v6probe', JSON.stringify({ t: Date.now(), ok })); } catch (e) { /* ignore */ }
|
||||
if (ok) setShow(true);
|
||||
})
|
||||
.catch(() => { clearTimeout(ti); });
|
||||
} catch (e) { /* ignore */ }
|
||||
}, []);
|
||||
|
||||
if (!show) return null;
|
||||
|
||||
const dismiss = (pick?: 'v6' | 'v4') => {
|
||||
try {
|
||||
localStorage.setItem('__v6hint', '1');
|
||||
if (pick === 'v6') {
|
||||
localStorage.setItem('__v6dest', 'v6');
|
||||
document.cookie = '__v6dest=v6; path=/; max-age=31536000; samesite=lax';
|
||||
window.location.href = V6 + window.location.pathname + window.location.search;
|
||||
return;
|
||||
}
|
||||
if (pick === 'v4') {
|
||||
localStorage.setItem('__v6dest', 'v4');
|
||||
document.cookie = '__v6dest=v4; path=/; max-age=31536000; samesite=lax';
|
||||
}
|
||||
} catch (e) { /* ignore */ }
|
||||
setShow(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<div style={{
|
||||
position: 'fixed',
|
||||
right: 16,
|
||||
bottom: 16,
|
||||
zIndex: 9999,
|
||||
maxWidth: 340,
|
||||
background: 'rgba(20,24,20,.96)',
|
||||
border: '1px solid rgba(80,220,120,.45)',
|
||||
borderRadius: 14,
|
||||
padding: '14px 16px',
|
||||
color: '#fff',
|
||||
fontFamily: 'system-ui, -apple-system, sans-serif',
|
||||
boxShadow: '0 8px 30px rgba(0,0,0,.45)',
|
||||
}}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', gap: 8 }}>
|
||||
<p style={{ margin: 0, fontWeight: 600, color: '#7ef0a0', fontSize: 14 }}>
|
||||
✅ 检测到你的网络支持 IPv6
|
||||
</p>
|
||||
<button onClick={() => dismiss()} aria-label='关闭' style={{
|
||||
background: 'none', border: 'none', color: 'rgba(255,255,255,.5)',
|
||||
fontSize: 16, cursor: 'pointer', lineHeight: 1, padding: 0,
|
||||
}}>×</button>
|
||||
</div>
|
||||
<p style={{ margin: '8px 0 12px', color: 'rgba(255,255,255,.65)', fontSize: 13, lineHeight: 1.5 }}>
|
||||
推荐切换到 IPv6 线路,观影更流畅。
|
||||
</p>
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<button onClick={() => dismiss('v6')} style={{
|
||||
flex: 1, padding: '8px 10px', borderRadius: 9,
|
||||
border: '1px solid rgba(80,220,120,.55)', background: 'rgba(80,220,120,.18)',
|
||||
color: '#fff', fontSize: 13, fontWeight: 600, cursor: 'pointer',
|
||||
}}>切换 IPv6</button>
|
||||
<button onClick={() => dismiss('v4')} style={{
|
||||
flex: 1, padding: '8px 10px', borderRadius: 9,
|
||||
border: '1px solid rgba(255,255,255,.18)', background: 'rgba(255,255,255,.06)',
|
||||
color: 'rgba(255,255,255,.8)', fontSize: 13, cursor: 'pointer',
|
||||
}}>保持 IPv4</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
+4
-1
@@ -37,7 +37,10 @@ export function processImageUrl(originalUrl: string): string {
|
||||
const proxyUrl = getImageProxyUrl();
|
||||
if (!proxyUrl) return originalUrl;
|
||||
|
||||
return `${proxyUrl}${encodeURIComponent(originalUrl)}`;
|
||||
// 代理地址若未自带查询参数(如 /api/image-proxy),补 ?url=,否则拼出的 URL 非法
|
||||
if (proxyUrl.includes('url=')) return `${proxyUrl}${encodeURIComponent(originalUrl)}`;
|
||||
const sep = proxyUrl.includes('?') ? '&' : '?url=';
|
||||
return `${proxyUrl}${sep}${encodeURIComponent(originalUrl)}`;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+4
-3
@@ -49,12 +49,13 @@ export async function middleware(request: NextRequest) {
|
||||
return NextResponse.next();
|
||||
}
|
||||
|
||||
// 首次访问不再强制跳转 /ipv6 选线路页:首页直接加载数据,线路由顶栏「IPV4/IPV6」切换
|
||||
|
||||
const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
|
||||
|
||||
if (!process.env.AUTH_PASSWORD) {
|
||||
// 如果没有设置密码,重定向到警告页面
|
||||
const warningUrl = new URL('/warning', request.url);
|
||||
return NextResponse.redirect(warningUrl);
|
||||
// 未配置 AUTH_PASSWORD 时直接放行,不强制访问控制
|
||||
return NextResponse.next();
|
||||
}
|
||||
|
||||
// 从cookie获取认证信息
|
||||
|
||||
Reference in new issue
Block a user