From 768db37011c797fb18041c0732721f27f07eb225 Mon Sep 17 00:00:00 2001 From: hailin Date: Wed, 25 Jun 2025 15:41:13 +0800 Subject: [PATCH] . --- chatdesk-ui/app/[locale]/login/page.tsx | 2 +- chatdesk-ui/app/api/chat/custom/route.ts | 2 +- chatdesk-ui/app/api/retrieval/process/docx/route.ts | 2 +- chatdesk-ui/app/api/retrieval/process/route.ts | 2 +- chatdesk-ui/app/api/retrieval/retrieve/route.ts | 2 +- chatdesk-ui/app/api/username/available/route.ts | 2 +- chatdesk-ui/app/api/username/get/route.ts | 2 +- chatdesk-ui/components/chat/chat-helpers/index.ts | 2 +- chatdesk-ui/lib/generate-bgem3-embedding.ts | 2 +- chatdesk-ui/lib/get-runtime-env.ts | 5 +++++ chatdesk-ui/lib/server/server-chat-helpers.ts | 2 +- chatdesk-ui/lib/supabase/browser-client.ts | 3 ++- chatdesk-ui/lib/supabase/client.ts | 2 +- chatdesk-ui/lib/supabase/middleware.ts | 2 +- 14 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 chatdesk-ui/lib/get-runtime-env.ts diff --git a/chatdesk-ui/app/[locale]/login/page.tsx b/chatdesk-ui/app/[locale]/login/page.tsx index 1a8b99b..21d6ec8 100644 --- a/chatdesk-ui/app/[locale]/login/page.tsx +++ b/chatdesk-ui/app/[locale]/login/page.tsx @@ -8,7 +8,7 @@ import { get } from "@vercel/edge-config" import { Metadata } from "next" import { cookies, headers } from "next/headers" import { redirect } from "next/navigation" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 import { PostgrestError } from '@supabase/supabase-js'; import initTranslations from "@/lib/i18n"; diff --git a/chatdesk-ui/app/api/chat/custom/route.ts b/chatdesk-ui/app/api/chat/custom/route.ts index 23ac615..4fcdc25 100644 --- a/chatdesk-ui/app/api/chat/custom/route.ts +++ b/chatdesk-ui/app/api/chat/custom/route.ts @@ -5,7 +5,7 @@ import { OpenAIStream, StreamingTextResponse } from "ai" import { ServerRuntime } from "next" import OpenAI from "openai" import { ChatCompletionCreateParamsBase } from "openai/resources/chat/completions.mjs" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 export const runtime: ServerRuntime = "edge" diff --git a/chatdesk-ui/app/api/retrieval/process/docx/route.ts b/chatdesk-ui/app/api/retrieval/process/docx/route.ts index 0bd3911..d23f9b2 100644 --- a/chatdesk-ui/app/api/retrieval/process/docx/route.ts +++ b/chatdesk-ui/app/api/retrieval/process/docx/route.ts @@ -6,7 +6,7 @@ import { FileItemChunk } from "@/types" import { createClient } from "@supabase/supabase-js" import { NextResponse } from "next/server" import OpenAI from "openai" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 import { generateBgeM3Embedding } from "@/lib/generate-bgem3-embedding" export async function POST(req: Request) { diff --git a/chatdesk-ui/app/api/retrieval/process/route.ts b/chatdesk-ui/app/api/retrieval/process/route.ts index dc0fd9c..320ab05 100644 --- a/chatdesk-ui/app/api/retrieval/process/route.ts +++ b/chatdesk-ui/app/api/retrieval/process/route.ts @@ -13,7 +13,7 @@ import { FileItemChunk } from "@/types" import { createClient } from "@supabase/supabase-js" import { NextResponse } from "next/server" import OpenAI from "openai" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 export async function POST(req: Request) { diff --git a/chatdesk-ui/app/api/retrieval/retrieve/route.ts b/chatdesk-ui/app/api/retrieval/retrieve/route.ts index 22382e8..cc6a048 100644 --- a/chatdesk-ui/app/api/retrieval/retrieve/route.ts +++ b/chatdesk-ui/app/api/retrieval/retrieve/route.ts @@ -4,7 +4,7 @@ import { checkApiKey, getServerProfile } from "@/lib/server/server-chat-helpers" import { Database } from "@/supabase/types" import { createClient } from "@supabase/supabase-js" import OpenAI from "openai" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 export async function POST(request: Request) { diff --git a/chatdesk-ui/app/api/username/available/route.ts b/chatdesk-ui/app/api/username/available/route.ts index 227022c..095b6b4 100644 --- a/chatdesk-ui/app/api/username/available/route.ts +++ b/chatdesk-ui/app/api/username/available/route.ts @@ -1,6 +1,6 @@ import { Database } from "@/supabase/types" import { createClient } from "@supabase/supabase-js" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 export const runtime = "edge" diff --git a/chatdesk-ui/app/api/username/get/route.ts b/chatdesk-ui/app/api/username/get/route.ts index 33c39b9..30c02be 100644 --- a/chatdesk-ui/app/api/username/get/route.ts +++ b/chatdesk-ui/app/api/username/get/route.ts @@ -1,6 +1,6 @@ import { Database } from "@/supabase/types" import { createClient } from "@supabase/supabase-js" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 export const runtime = "edge" diff --git a/chatdesk-ui/components/chat/chat-helpers/index.ts b/chatdesk-ui/components/chat/chat-helpers/index.ts index 5f68819..aa6313f 100644 --- a/chatdesk-ui/components/chat/chat-helpers/index.ts +++ b/chatdesk-ui/components/chat/chat-helpers/index.ts @@ -22,7 +22,7 @@ import { import React from "react" import { toast } from "sonner" import { v4 as uuidv4 } from "uuid" -import { getRuntimeEnv } from "@/lib/ipconfig" +//import { getRuntimeEnv } from "@/lib/ipconfig" type RetrievedFileItem = Tables<"file_items"> & { diff --git a/chatdesk-ui/lib/generate-bgem3-embedding.ts b/chatdesk-ui/lib/generate-bgem3-embedding.ts index 962d166..ace5abe 100644 --- a/chatdesk-ui/lib/generate-bgem3-embedding.ts +++ b/chatdesk-ui/lib/generate-bgem3-embedding.ts @@ -1,4 +1,4 @@ -import { getRuntimeEnv } from "@/lib/ipconfig" +//import { getRuntimeEnv } from "@/lib/ipconfig" export async function generateBgeM3Embedding(text: string): Promise { try { diff --git a/chatdesk-ui/lib/get-runtime-env.ts b/chatdesk-ui/lib/get-runtime-env.ts new file mode 100644 index 0000000..08cc095 --- /dev/null +++ b/chatdesk-ui/lib/get-runtime-env.ts @@ -0,0 +1,5 @@ +// lib/get-runtime-env.ts +export function getRuntimeEnv(key: string): string | undefined { + if (typeof window === "undefined") return process.env[key]; // SSR fallback + return (window as any).RUNTIME_ENV?.[key]; +} diff --git a/chatdesk-ui/lib/server/server-chat-helpers.ts b/chatdesk-ui/lib/server/server-chat-helpers.ts index 51a08e3..1cc8950 100644 --- a/chatdesk-ui/lib/server/server-chat-helpers.ts +++ b/chatdesk-ui/lib/server/server-chat-helpers.ts @@ -3,7 +3,7 @@ import { VALID_ENV_KEYS } from "@/types/valid-keys" //import { createServerClient } from "@supabase/ssr" import { getSupabaseServerClient } from "@/lib/supabase/server" import { cookies } from "next/headers" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 export async function getServerProfile() { diff --git a/chatdesk-ui/lib/supabase/browser-client.ts b/chatdesk-ui/lib/supabase/browser-client.ts index c37a97f..6c076c4 100644 --- a/chatdesk-ui/lib/supabase/browser-client.ts +++ b/chatdesk-ui/lib/supabase/browser-client.ts @@ -54,7 +54,8 @@ import { createBrowserClient } from "@supabase/ssr" -import { getRuntimeEnv } from "@/lib/ipconfig" +//import { getRuntimeEnv } from "@/lib/ipconfig" +import { getRuntimeEnv } from "@/lib/get-runtime-env" // ✅ 新路径 import { Database } from "@/supabase/types" // 动态获取 URL,防止静态打包成 localhost:8000 diff --git a/chatdesk-ui/lib/supabase/client.ts b/chatdesk-ui/lib/supabase/client.ts index b4968a7..383c07e 100644 --- a/chatdesk-ui/lib/supabase/client.ts +++ b/chatdesk-ui/lib/supabase/client.ts @@ -9,7 +9,7 @@ import { createBrowserClient } from "@supabase/ssr" -import { getRuntimeEnv } from "@/lib/ipconfig" +//import { getRuntimeEnv } from "@/lib/ipconfig" export const createClient = () => createBrowserClient( diff --git a/chatdesk-ui/lib/supabase/middleware.ts b/chatdesk-ui/lib/supabase/middleware.ts index 0a268c4..4d3e3a4 100644 --- a/chatdesk-ui/lib/supabase/middleware.ts +++ b/chatdesk-ui/lib/supabase/middleware.ts @@ -1,6 +1,6 @@ import { createServerClient, type CookieOptions } from "@supabase/ssr" import { NextResponse, type NextRequest } from "next/server" -import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 +//import { getRuntimeEnv } from "@/lib/ipconfig" // 新增引入 export const createClient = (request: NextRequest) => { // Create an unmodified response