From 2c8a68b06475ddd4fca1d548640a9fa8eee93bcd Mon Sep 17 00:00:00 2001 From: 3970260761 <3970260761@qq.com> Date: Mon, 9 Nov 2026 18:06:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20middleware=20=E9=A6=96=E8=AE=BF?= =?UTF-8?q?=E6=9C=AA=E9=80=89=E7=BA=BF=E8=B7=AF=E6=97=B6=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=20/ipv6=20=E9=80=89=E6=8B=A9=E9=A1=B5=20(v-fixed98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- src/app/ipv6/page.tsx | 2 ++ src/components/Ipv6FirstVisitGate.tsx | 2 ++ src/middleware.ts | 13 +++++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 452eea6..4073f52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ 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 +ENV NEXT_PUBLIC_SITE_VERSION=fixed98 # 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 +52,7 @@ 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_SITE_VERSION=fixed98 # 从构建器中复制 standalone 输出 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ diff --git a/src/app/ipv6/page.tsx b/src/app/ipv6/page.tsx index 26020f6..4e2c3af 100644 --- a/src/app/ipv6/page.tsx +++ b/src/app/ipv6/page.tsx @@ -91,6 +91,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 +126,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'); diff --git a/src/components/Ipv6FirstVisitGate.tsx b/src/components/Ipv6FirstVisitGate.tsx index 79b70c5..fa6e8d2 100644 --- a/src/components/Ipv6FirstVisitGate.tsx +++ b/src/components/Ipv6FirstVisitGate.tsx @@ -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'); diff --git a/src/middleware.ts b/src/middleware.ts index 1034f3b..f5d02f2 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -49,6 +49,19 @@ export async function middleware(request: NextRequest) { return NextResponse.next(); } + // 首访线路选择(源码化,替代旧 patches/patch_license.js 的 V6-PROBE): + // 公网 IPv4 入口且未记住线路(cookie __v6dest 缺失)时,先跳 /ipv6 选择页再回来 + const hostName = (request.headers.get('host') || request.nextUrl.hostname || '').split(':')[0]; + if ( + hostName === 'tv.88531.cn' && + pathname !== '/warning' && + !request.cookies.get('__v6dest') + ) { + const u = new URL('/ipv6', request.url); + u.searchParams.set('back', pathname + request.nextUrl.search); + return NextResponse.redirect(u); + } + const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage'; if (!process.env.AUTH_PASSWORD) {