diff --git a/chatdesk-ui/app/[locale]/layout.tsx b/chatdesk-ui/app/[locale]/layout.tsx index 754a82d..fc22bad 100644 --- a/chatdesk-ui/app/[locale]/layout.tsx +++ b/chatdesk-ui/app/[locale]/layout.tsx @@ -3,16 +3,16 @@ import { GlobalState } from "@/components/utility/global-state" import { Providers } from "@/components/utility/providers" import TranslationsProvider from "@/components/utility/translations-provider" import initTranslations from "@/lib/i18n" -import { Database } from "@/supabase/types" +//import { Database } from "@/supabase/types" import { getSupabaseServerClient } from "@/lib/supabase/server" import { Metadata, Viewport } from "next" import { Inter } from "next/font/google" import { cookies } from "next/headers" import { ReactNode } from "react" import "./globals.css" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 -import Script from "next/script" +//import Script from "next/script" import { Suspense } from "react" +import { RuntimeEnvProvider } from "@/components/utility/runtime-env-provider" const inter = Inter({ subsets: ["latin"] }) @@ -31,20 +31,20 @@ interface RootLayoutProps { // 新增的 `getValidSupabaseUrl` 函数，带有超时机制和错误处理 -async function getValidSupabaseUrl(): Promise { - let url = getRuntimeEnv("SUPABASE_URL"); - const timeout = Date.now() + 30000; // 设置最大等待时间为30秒 +// async function getValidSupabaseUrl(): Promise { +// 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; -} +// 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; +// } @@ -113,15 +113,15 @@ export default async function RootLayout({ 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
Failed to fetch Supabase configuration, please try again later.
; // 出现错误时返回一个友好的提示 - } + // let supabaseUrl = ""; + // try { + // // 等待直到获取到有效的 Supabase URL + // supabaseUrl = await getValidSupabaseUrl(); + // //console.log("==========>获取到有效的 Supabase URL: ", supabaseUrl); + // } catch (error) { + // console.error("Supabase URL 获取失败:", error); + // return
Failed to fetch Supabase configuration, please try again later.
; // 出现错误时返回一个友好的提示 + // } const supabase = getSupabaseServerClient() const { data, error } = await supabase.auth.getSession(); @@ -137,27 +137,29 @@ export default async function RootLayout({ -