hailin
/
chatdesk-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

This commit is contained in:
hailin 2025-06-25 18:28:57 +08:00
parent 7d70c45db8
commit 32874e0d15
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chatdesk-ui/app/[locale]/layout.tsx
View File

@ -3,14 +3,12 @@ import { GlobalState } from "@/components/utility/global-state"
import { Providers } from "@/components/utility/providers" import { Providers } from "@/components/utility/providers"
import TranslationsProvider from "@/components/utility/translations-provider" import TranslationsProvider from "@/components/utility/translations-provider"
import initTranslations from "@/lib/i18n" import initTranslations from "@/lib/i18n"
//import { Database } from "@/supabase/types"
import { getSupabaseServerClient } from "@/lib/supabase/server" import { getSupabaseServerClient } from "@/lib/supabase/server"
import { Metadata, Viewport } from "next" import { Metadata, Viewport } from "next"
import { Inter } from "next/font/google" import { Inter } from "next/font/google"
import { cookies } from "next/headers" import { cookies } from "next/headers"
import { ReactNode } from "react" import { ReactNode } from "react"
import "./globals.css" import "./globals.css"
//import Script from "next/script"
import { Suspense } from "react" import { Suspense } from "react"
import { RuntimeEnvProvider } from "@/components/utility/runtime-env-provider" import { RuntimeEnvProvider } from "@/components/utility/runtime-env-provider"
@ -28,26 +26,6 @@ interface RootLayoutProps {
} }
} }
// 新增的 `getValidSupabaseUrl` 函数，带有超时机制和错误处理
// async function getValidSupabaseUrl(): Promise<string> {
// let url = getRuntimeEnv("SUPABASE_URL");
// const timeout = Date.now() + 30000; // 设置最大等待时间为30秒
// while (!url || !url.includes(":")) { // 检查是否包含合法的 IP 和端口
// if (Date.now() > timeout) {
// throw new Error("获取有效的 Supabase URL 超时");
// }
// console.log("等待有效的 Supabase URL...");
// await new Promise(resolve => setTimeout(resolve, 1000)); // 每1秒检查一次
// url = getRuntimeEnv("SUPABASE_URL");
// }
// return url;
// }
export async function generateMetadata({ export async function generateMetadata({
params: { locale } params: { locale }
}: { }: {
@ -113,16 +91,6 @@ export default async function RootLayout({
console.log(`🍪 Cookie: ${cookie.name} = ${cookie.value}`); console.log(`🍪 Cookie: ${cookie.name} = ${cookie.value}`);
} }
// let supabaseUrl = "";
// try {
// // 等待直到获取到有效的 Supabase URL
// supabaseUrl = await getValidSupabaseUrl();
// //console.log("==========>获取到有效的 Supabase URL: ", supabaseUrl);
// } catch (error) {
// console.error("Supabase URL 获取失败:", error);
// return <div>Failed to fetch Supabase configuration, please try again later.</div>; // 出现错误时返回一个友好的提示
// }
const supabase = getSupabaseServerClient() const supabase = getSupabaseServerClient()
const { data, error } = await supabase.auth.getSession(); const { data, error } = await supabase.auth.getSession();
if (error) { if (error) {
@ -137,11 +105,7 @@ export default async function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<head> <head>
{/* <Script {/* <RuntimeEnvProvider /> */}
src="/env.js"
strategy="beforeInteractive" // 确保在 React 启动之前加载
/> */}
<RuntimeEnvProvider /> {/* ✅ 注入 window.RUNTIME_ENV.SUPABASE_URL */}
</head> </head>
<body className={inter.className}> <body className={inter.className}>