@lobehub/chat 1.51.2 → 1.51.4

package/src/features/DevPanel/{PostgresViewer/DataTable/Table.tsx → features/Table/index.tsx}

@@ -1,9 +1,10 @@
+import { Icon } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
+import { Loader2Icon } from 'lucide-react';
 import React from 'react';
 import { Center } from 'react-layout-kit';
 import { TableVirtuoso } from 'react-virtuoso';
 
-import { usePgTable, useTableColumns } from '../usePgTable';
 import TableCell from './TableCell';
 
 const useStyles = createStyles(({ token, css }) => ({
@@ -88,24 +89,21 @@ const useStyles = createStyles(({ token, css }) => ({
 }));
 
 interface TableProps {
-  tableName?: string;
+  columns: string[];
+  dataSource: any[];
+  loading?: boolean;
 }
 
-const Table = ({ tableName }: TableProps) => {
+const Table = ({ columns, dataSource, loading }: TableProps) => {
   const { styles } = useStyles();
 
-  const tableColumns = useTableColumns(tableName);
+  if (loading)
+    return (
+      <Center height={'100%'}>
+        <Icon icon={Loader2Icon} spin />
+      </Center>
+    );
 
-  const tableData = usePgTable(tableName);
-
-  const columns = tableColumns.data?.map((t) => t.name) || [];
-  const isLoading = tableColumns.isLoading || tableData.isLoading;
-
-  if (!tableName) return <Center height={'80%'}>Select a table to view data</Center>;
-
-  if (isLoading) return <Center height={'80%'}>Loading...</Center>;
-
-  const dataSource = tableData.data?.data || [];
   const header = (
     <tr>
       {columns.map((column) => (

package/src/features/DevPanel/index.tsx

@@ -1,12 +1,36 @@
-'use client';
+import { BookText, DatabaseIcon, FlagIcon, GlobeLockIcon } from 'lucide-react';
 
-import FloatPanel from './FloatPanel';
+import CacheViewer from './CacheViewer';
+import FeatureFlagViewer from './FeatureFlagViewer';
+import MetadataViewer from './MetadataViewer';
 import PostgresViewer from './PostgresViewer';
+import FloatPanel from './features/FloatPanel';
 
 const DevPanel = () => (
-  <FloatPanel>
-    <PostgresViewer />
-  </FloatPanel>
+  <FloatPanel
+    items={[
+      {
+        children: <PostgresViewer />,
+        icon: <DatabaseIcon size={16} />,
+        key: 'Postgres Viewer',
+      },
+      {
+        children: <MetadataViewer />,
+        icon: <BookText size={16} />,
+        key: 'SEO Metadata',
+      },
+      {
+        children: <CacheViewer />,
+        icon: <GlobeLockIcon size={16} />,
+        key: 'NextJS Caches',
+      },
+      {
+        children: <FeatureFlagViewer />,
+        icon: <FlagIcon size={16} />,
+        key: 'Feature Flags',
+      },
+    ]}
+  />
 );
 
 export default DevPanel;

package/src/hooks/useActiveTabKey.ts

@@ -1,5 +1,4 @@
 import { usePathname } from 'next/navigation';
-import { useQueryState } from 'nuqs';
 
 import { ProfileTabs, SettingsTabs, SidebarTabKey } from '@/store/global/initialState';
 
@@ -17,14 +16,11 @@ export const useActiveTabKey = () => {
  */
 export const useActiveSettingsKey = () => {
   const pathname = usePathname();
-  const [tab] = useQueryState('tab');
 
   const tabs = pathname.split('/').at(-1);
 
   if (tabs === 'settings') return SettingsTabs.Common;
 
-  if (tabs === 'modal') return tab as SettingsTabs;
-
   return tabs as SettingsTabs;
 };
 
@@ -33,13 +29,10 @@ export const useActiveSettingsKey = () => {
  */
 export const useActiveProfileKey = () => {
   const pathname = usePathname();
-  const [tab] = useQueryState('tab');
 
   const tabs = pathname.split('/').at(-1);
 
   if (tabs === 'profile') return ProfileTabs.Profile;
 
-  if (tabs === 'modal') return tab as ProfileTabs;
-
   return tabs as ProfileTabs;
 };

package/src/layout/AuthProvider/Clerk/index.tsx

@@ -44,7 +44,6 @@ const Clerk = memo(({ children }: PropsWithChildren) => {
   return (
     <ClerkProvider
       appearance={updatedAppearance}
-      dynamic
       localization={localization}
       signUpUrl={!enableClerkSignUp ? '/login' : '/signup'} // Redirect sign-up to sign-in if disabled
     >

package/src/layout/GlobalProvider/ReactScan.tsx

@@ -1,15 +1,13 @@
 'use client';
 
-import { useSearchParams } from 'next/navigation';
 import Script from 'next/script';
+import { useQueryState } from 'nuqs';
 import React, { memo } from 'react';
 
 import { withSuspense } from '@/components/withSuspense';
 
 const ReactScan = memo(() => {
-  const searchParams = useSearchParams();
-
-  const debug = searchParams.get('debug');
+  const [debug] = useQueryState('debug', { clearOnDefault: true, defaultValue: '' });
 
   return !!debug && <Script src="https://unpkg.com/react-scan/dist/auto.global.js" />;
 });

package/src/layout/GlobalProvider/StoreInitialization.tsx

@@ -1,6 +1,7 @@
 'use client';
 
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useRouter } from 'next/navigation';
+import { useQueryState } from 'nuqs';
 import { memo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createStoreUpdater } from 'zustand-utils';
@@ -81,7 +82,11 @@ const StoreInitialization = memo(() => {
   useStoreUpdater('router', router);
 
   // Import settings from the url
-  const searchParam = useSearchParams().get(LOBE_URL_IMPORT_NAME);
+  const [searchParam] = useQueryState(LOBE_URL_IMPORT_NAME, {
+    clearOnDefault: true,
+    defaultValue: '',
+  });
+
   useEffect(() => {
     // Why use `usUserStateInit`,
     // see: https://github.com/lobehub/lobe-chat/pull/4072

package/src/layout/GlobalProvider/index.tsx

@@ -1,19 +1,11 @@
-import { cookies, headers } from 'next/headers';
-import { PropsWithChildren, Suspense } from 'react';
+import { ReactNode, Suspense } from 'react';
 
 import { appEnv } from '@/config/app';
 import { getServerFeatureFlagsValue } from '@/config/featureFlags';
-import { LOBE_LOCALE_COOKIE } from '@/const/locale';
-import {
-  LOBE_THEME_APPEARANCE,
-  LOBE_THEME_NEUTRAL_COLOR,
-  LOBE_THEME_PRIMARY_COLOR,
-} from '@/const/theme';
 import DevPanel from '@/features/DevPanel';
 import { getServerGlobalConfig } from '@/server/globalConfig';
 import { ServerConfigStoreProvider } from '@/store/serverConfig';
-import { getAntdLocale, parseBrowserLanguage } from '@/utils/locale';
-import { isMobileDevice } from '@/utils/server/responsive';
+import { getAntdLocale } from '@/utils/locale';
 
 import AntdV5MonkeyPatch from './AntdV5MonkeyPatch';
 import AppTheme from './AppTheme';
@@ -23,37 +15,37 @@ import ReactScan from './ReactScan';
 import StoreInitialization from './StoreInitialization';
 import StyleRegistry from './StyleRegistry';
 
-const GlobalLayout = async ({ children }: PropsWithChildren) => {
-  // get default theme config to use with ssr
-  const cookieStore = await cookies();
-  const appearance = cookieStore.get(LOBE_THEME_APPEARANCE);
-  const neutralColor = cookieStore.get(LOBE_THEME_NEUTRAL_COLOR);
-  const primaryColor = cookieStore.get(LOBE_THEME_PRIMARY_COLOR);
-
-  // get default locale config to use with ssr
-  const defaultLang = cookieStore.get(LOBE_LOCALE_COOKIE);
-  const header = await headers();
-  const fallbackLang = parseBrowserLanguage(header);
-
-  // if it's a new user, there's no cookie
-  // So we need to use the fallback language parsed by accept-language
-  const userLocale = defaultLang?.value || fallbackLang;
+interface GlobalLayoutProps {
+  appearance: string;
+  children: ReactNode;
+  isMobile: boolean;
+  locale: string;
+  neutralColor?: string;
+  primaryColor?: string;
+}
 
+const GlobalLayout = async ({
+  children,
+  neutralColor,
+  primaryColor,
+  locale: userLocale,
+  appearance,
+  isMobile,
+}: GlobalLayoutProps) => {
   const antdLocale = await getAntdLocale(userLocale);
 
   // get default feature flags to use with ssr
   const serverFeatureFlags = getServerFeatureFlagsValue();
   const serverConfig = getServerGlobalConfig();
-  const isMobile = await isMobileDevice();
   return (
     <StyleRegistry>
       <Locale antdLocale={antdLocale} defaultLang={userLocale}>
         <AppTheme
           customFontFamily={appEnv.CUSTOM_FONT_FAMILY}
           customFontURL={appEnv.CUSTOM_FONT_URL}
-          defaultAppearance={appearance?.value}
-          defaultNeutralColor={neutralColor?.value as any}
-          defaultPrimaryColor={primaryColor?.value as any}
+          defaultAppearance={appearance}
+          defaultNeutralColor={neutralColor as any}
+          defaultPrimaryColor={primaryColor as any}
           globalCDN={appEnv.CDN_USE_GLOBAL}
         >
           <ServerConfigStoreProvider

package/src/libs/agent-runtime/AgentRuntime.test.ts

@@ -26,7 +26,6 @@ import {
   ModelProvider,
 } from '@/libs/agent-runtime';
 import { LobeStepfunAI } from '@/libs/agent-runtime/stepfun';
-import LobeWenxinAI from '@/libs/agent-runtime/wenxin';
 import { createTraceOptions } from '@/server/modules/AgentRuntime';
 
 import { AgentChatOptions } from './AgentRuntime';

package/src/libs/agent-runtime/AgentRuntime.ts

@@ -47,6 +47,7 @@ import {
   TextToSpeechPayload,
 } from './types';
 import { LobeUpstageAI } from './upstage';
+import { LobeWenxinAI } from './wenxin';
 import { LobeXAI } from './xai';
 import { LobeZeroOneAI } from './zeroone';
 import { LobeZhipuAI } from './zhipu';
@@ -167,6 +168,7 @@ class AgentRuntime {
       taichu: Partial<ClientOptions>;
       togetherai: Partial<ClientOptions>;
       upstage: Partial<ClientOptions>;
+      wenxin: Partial<ClientOptions>;
       xai: Partial<ClientOptions>;
       zeroone: Partial<ClientOptions>;
       zhipu: Partial<ClientOptions>;
@@ -370,6 +372,11 @@ class AgentRuntime {
         runtimeModel = new LobeDoubaoAI(params.doubao);
         break;
       }
+
+      case ModelProvider.Wenxin: {
+        runtimeModel = new LobeWenxinAI(params.wenxin);
+        break;
+      }
     }
     return new AgentRuntime(runtimeModel);
   }

package/src/libs/agent-runtime/wenxin/index.ts

@@ -1,107 +1,10 @@
-import { ChatCompletion } from '@baiducloud/qianfan';
-
-// 如果引入了这个类型，那么在跑 type-check 的 tsc 检查中就会抛错，大无语
-// import type QianFanClient from '@baiducloud/qianfan/src/ChatCompletion/index';
-import { safeParseJSON } from '@/utils/safeParseJSON';
-
-import { LobeRuntimeAI } from '../BaseAI';
-import { AgentRuntimeErrorType } from '../error';
-import { ChatCompetitionOptions, ChatStreamPayload } from '../types';
-import { AgentRuntimeError } from '../utils/createError';
-import { debugStream } from '../utils/debugStream';
-import { StreamingResponse } from '../utils/response';
-import { convertIterableToStream } from '../utils/streams';
-import { WenxinStream } from '../utils/streams/wenxin';
-import { ChatResp } from './type';
-
-interface ChatErrorCode {
-  error_code: number;
-  error_msg: string;
-}
-
-export interface LobeWenxinAIParams {
-  accessKey?: string;
-  baseURL?: string;
-  secretKey?: string;
-}
-
-export class LobeWenxinAI implements LobeRuntimeAI {
-  private client: any;
-  baseURL?: string;
-
-  constructor({ accessKey, baseURL, secretKey }: LobeWenxinAIParams = {}) {
-    if (!accessKey || !secretKey)
-      throw AgentRuntimeError.createError(AgentRuntimeErrorType.InvalidProviderAPIKey);
-
-    this.client = new ChatCompletion({
-      QIANFAN_ACCESS_KEY: accessKey,
-      QIANFAN_SECRET_KEY: secretKey,
-    });
-    this.baseURL = baseURL;
-  }
-
-  async chat(payload: ChatStreamPayload, options?: ChatCompetitionOptions) {
-    try {
-      const result = await this.client.chat(
-        { messages: payload.messages as any, stream: true, user_id: options?.user },
-        payload.model,
-      );
-
-      const wenxinStream = convertIterableToStream(result as AsyncIterable<ChatResp>);
-
-      const [prod, useForDebug] = wenxinStream.tee();
-
-      if (process.env.DEBUG_WENXIN_CHAT_COMPLETION === '1') {
-        debugStream(useForDebug).catch();
-      }
-
-      const stream = WenxinStream(prod, options?.callback);
-
-      // Respond with the stream
-      return StreamingResponse(stream, { headers: options?.headers });
-    } catch (e) {
-      const err = e as Error;
-
-      const error: ChatErrorCode | undefined = safeParseJSON(err.message);
-
-      if (!error) {
-        throw AgentRuntimeError.createError(AgentRuntimeErrorType.AgentRuntimeError, {
-          message: err.message,
-          name: err.name,
-        });
-      }
-
-      // 文心一言错误码
-      // https://cloud.baidu.com/doc/WENXINWORKSHOP/s/tlmyncueh
-      switch (error.error_code) {
-        // Invalid API key or access key
-        case 100:
-        case 13:
-        case 14: {
-          throw AgentRuntimeError.createError(AgentRuntimeErrorType.InvalidProviderAPIKey, error);
-        }
-
-        // quota limit
-        case 4:
-        case 17:
-        case 18:
-        case 19:
-        case 336_501:
-        case 336_502:
-        case 336_503:
-        case 336_504:
-        case 336_505:
-        case 336_507: {
-          throw AgentRuntimeError.createError(AgentRuntimeErrorType.QuotaLimitReached, {
-            errorCode: error.error_code,
-            message: `${error.error_msg} | you can visit https://cloud.baidu.com/doc/WENXINWORKSHOP/s/tlmyncueh for more information about the error code`,
-          });
-        }
-      }
-
-      throw AgentRuntimeError.createError(AgentRuntimeErrorType.ProviderBizError, error);
-    }
-  }
-}
-
-export default LobeWenxinAI;
+import { ModelProvider } from '../types';
+import { LobeOpenAICompatibleFactory } from '../utils/openaiCompatibleFactory';
+
+export const LobeWenxinAI = LobeOpenAICompatibleFactory({
+  baseURL: 'https://qianfan.baidubce.com/v2',
+  debug: {
+    chatCompletion: () => process.env.DEBUG_WENXIN_CHAT_COMPLETION === '1',
+  },
+  provider: ModelProvider.Wenxin,
+});

package/src/locales/create.ts

@@ -5,8 +5,7 @@ import { initReactI18next } from 'react-i18next';
 import { isRtlLang } from 'rtl-detect';
 
 import { getDebugConfig } from '@/config/debug';
-import { DEFAULT_LANG, LOBE_LOCALE_COOKIE } from '@/const/locale';
-import { COOKIE_CACHE_DAYS } from '@/const/settings';
+import { DEFAULT_LANG } from '@/const/locale';
 import { normalizeLocale } from '@/locales/resources';
 import { isDev, isOnServerSide } from '@/utils/env';
 
@@ -36,20 +35,20 @@ export const createI18nNext = (lang?: string) => {
       instance.init({
         debug: debugMode,
         defaultNS: ['error', 'common', 'chat'],
-        detection: {
-          caches: ['cookie'],
-          cookieMinutes: 60 * 24 * COOKIE_CACHE_DAYS,
-          /**
-             Set `sameSite` to `lax` so that the i18n cookie can be passed to the
-             server side when returning from the OAuth authorization website.
-             ref: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
-             discussion: https://github.com/lobehub/lobe-chat/pull/1474
-          */
-          cookieOptions: {
-            sameSite: 'lax',
-          },
-          lookupCookie: LOBE_LOCALE_COOKIE,
-        },
+        // detection: {
+        //   caches: ['cookie'],
+        //   cookieMinutes: 60 * 24 * COOKIE_CACHE_DAYS,
+        //   /**
+        //      Set `sameSite` to `lax` so that the i18n cookie can be passed to the
+        //      server side when returning from the OAuth authorization website.
+        //      ref: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
+        //      discussion: https://github.com/lobehub/lobe-chat/pull/1474
+        //   */
+        //   cookieOptions: {
+        //     sameSite: 'lax',
+        //   },
+        //   lookupCookie: LOBE_LOCALE_COOKIE,
+        // },
         fallbackLng: DEFAULT_LANG,
         interpolation: {
           escapeValue: false,

package/src/locales/default/modelProvider.ts

@@ -296,26 +296,6 @@ export default {
     tooltip: '更新服务商基础配置',
     updateSuccess: '更新成功',
   },
-  wenxin: {
-    accessKey: {
-      desc: '填入百度千帆平台的 Access Key',
-      placeholder: 'Qianfan Access Key',
-      title: 'Access Key',
-    },
-    checker: {
-      desc: '测试 AccessKey / SecretAccess 是否填写正确',
-    },
-    secretKey: {
-      desc: '填入百度千帆平台 Secret Key',
-      placeholder: 'Qianfan Secret Key',
-      title: 'Secret Key',
-    },
-    unlock: {
-      customRegion: '自定义服务区域',
-      description: '输入你的 AccessKey / SecretKey 即可开始会话。应用不会记录你的鉴权配置',
-      title: '使用自定义文心一言鉴权信息',
-    },
-  },
   zeroone: {
     title: '01.AI 零一万物',
   },

package/src/middleware.ts

@@ -1,8 +1,13 @@
 import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';
-import { NextResponse } from 'next/server';
+import { NextRequest, NextResponse } from 'next/server';
+import { UAParser } from 'ua-parser-js';
+import urlJoin from 'url-join';
 
 import { authEnv } from '@/config/auth';
+import { LOBE_THEME_APPEARANCE } from '@/const/theme';
 import NextAuthEdge from '@/libs/next-auth/edge';
+import { parseBrowserLanguage } from '@/utils/locale';
+import { RouteVariants } from '@/utils/server/routeVariants';
 
 import { OAUTH_AUTHORIZED } from './const/auth';
 
@@ -16,20 +21,86 @@ export const config = {
     '/discover(.*)',
     '/chat',
     '/chat(.*)',
+    '/changelog(.*)',
     '/settings(.*)',
     '/files',
     '/files(.*)',
     '/repos(.*)',
+    '/profile(.*)',
+    '/me',
+    '/me(.*)',
+
+    '/login(.*)',
+    '/signup(.*)',
+    '/next-auth/error',
     // ↓ cloud ↓
   ],
 };
 
-const defaultMiddleware = () => NextResponse.next();
+const parseDefaultThemeFromTime = (request: NextRequest) => {
+  // 获取经度信息，Next.js 会自动解析 geo 信息到请求对象中
+  const longitude = 'geo' in request && (request.geo as any)?.longitude;
+
+  if (typeof longitude === 'number') {
+    // 计算时区偏移（每15度经度对应1小时）
+    // 东经为正，西经为负
+    const offsetHours = Math.round(longitude / 15);
+
+    // 计算当地时间
+    const localHour = (new Date().getUTCHours() + offsetHours + 24) % 24;
+    console.log(`[theme] localHour: ${localHour}`);
+
+    // 6点到18点之间返回 light 主题
+    return localHour >= 6 && localHour < 18 ? 'light' : 'dark';
+  }
+
+  return 'light';
+};
+
+const defaultMiddleware = (request: NextRequest) => {
+  // 1. 从 cookie 中读取用户偏好
+  const theme =
+    request.cookies.get(LOBE_THEME_APPEARANCE)?.value || parseDefaultThemeFromTime(request);
+
+  // if it's a new user, there's no cookie
+  // So we need to use the fallback language parsed by accept-language
+  const locale = parseBrowserLanguage(request.headers);
+  // const locale =
+  // request.cookies.get(LOBE_LOCALE_COOKIE)?.value ||
+  // browserLanguage;
+
+  const ua = request.headers.get('user-agent');
+
+  const device = new UAParser(ua || '').getDevice();
+
+  // 2. 创建规范化的偏好值
+  const route = RouteVariants.serializeVariants({
+    isMobile: device.type === 'mobile',
+    locale,
+    theme,
+  });
+
+  const url = new URL(request.url);
+  if (['/api', '/trpc', '/webapi'].some((path) => url.pathname.startsWith(path)))
+    return NextResponse.next();
+
+  // 处理 URL 重写
+  // 构建新路径: /${route}${originalPathname}
+  // 只对 GET 请求进行 URL 重写，确保其他类型的请求（包括 OPTIONS）不受影响
+  const nextPathname = `/${urlJoin(route, url.pathname)}`;
+  console.log(`[rewrite] ${url.pathname} -> ${nextPathname}`);
+  url.pathname = nextPathname;
+
+  return NextResponse.rewrite(url);
+};
+
+const publicRoute = ['/', '/discover'];
 
 // Initialize an Edge compatible NextAuth middleware
 const nextAuthMiddleware = NextAuthEdge.auth((req) => {
+  const response = defaultMiddleware(req);
   // skip the '/' route
-  if (req.nextUrl.pathname === '/') return NextResponse.next();
+  if (publicRoute.some((url) => req.nextUrl.pathname.startsWith(url))) return response;
 
   // Just check if session exists
   const session = req.auth;
@@ -39,35 +110,37 @@ const nextAuthMiddleware = NextAuthEdge.auth((req) => {
   const isLoggedIn = !!session?.expires;
 
   // Remove & amend OAuth authorized header
-  const requestHeaders = new Headers(req.headers);
-  requestHeaders.delete(OAUTH_AUTHORIZED);
-  if (isLoggedIn) requestHeaders.set(OAUTH_AUTHORIZED, 'true');
-
-  return NextResponse.next({
-    request: {
-      headers: requestHeaders,
-    },
-  });
+  response.headers.delete(OAUTH_AUTHORIZED);
+  if (isLoggedIn) {
+    response.headers.set(OAUTH_AUTHORIZED, 'true');
+  }
+
+  return response;
 });
 
 const isProtectedRoute = createRouteMatcher([
   '/settings(.*)',
   '/files(.*)',
+  '/onboard(.*)',
   // ↓ cloud ↓
 ]);
 
+const clerkAuthMiddleware = clerkMiddleware(
+  async (auth, req) => {
+    if (isProtectedRoute(req)) await auth.protect();
+
+    return defaultMiddleware(req);
+  },
+  {
+    // https://github.com/lobehub/lobe-chat/pull/3084
+    clockSkewInMs: 60 * 60 * 1000,
+    signInUrl: '/login',
+    signUpUrl: '/signup',
+  },
+);
+
 export default authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH
-  ? clerkMiddleware(
-      async (auth, req) => {
-        if (isProtectedRoute(req)) await auth.protect();
-      },
-      {
-        // https://github.com/lobehub/lobe-chat/pull/3084
-        clockSkewInMs: 60 * 60 * 1000,
-        signInUrl: '/login',
-        signUpUrl: '/signup',
-      },
-    )
+  ? clerkAuthMiddleware
   : authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH
     ? nextAuthMiddleware
     : defaultMiddleware;