@lobehub/lobehub 2.0.0-next.185 → 2.0.0-next.187

package/src/libs/next/config/define-config.ts

@@ -6,9 +6,11 @@ import type { Header, Redirect } from 'next/dist/lib/load-custom-routes';
 import ReactComponentName from 'react-scan/react-component-name/webpack';
 
 interface CustomNextConfig {
+  experimental?: NextConfig['experimental'];
   headers?: Header[];
   redirects?: Redirect[];
   turbopack?: NextConfig['turbopack'];
+  webpack?: NextConfig['webpack'];
 }
 
 export function defineConfig(config: CustomNextConfig) {
@@ -56,6 +58,7 @@ export function defineConfig(config: CustomNextConfig) {
       webVitalsAttribution: ['CLS', 'LCP'],
       webpackBuildWorker: true,
       webpackMemoryOptimizations: true,
+      ...config.experimental,
     },
     async headers() {
       const securityHeaders = [
@@ -325,20 +328,20 @@ export function defineConfig(config: CustomNextConfig) {
       ignoreBuildErrors: true,
     },
 
-    webpack(config) {
-      config.experiments = {
+    webpack(baseWebpackConfig, options) {
+      baseWebpackConfig.experiments = {
         asyncWebAssembly: true,
         layers: true,
       };
 
       // 开启该插件会导致 pglite 的 fs bundler 被改表
       if (enableReactScan) {
-        config.plugins.push(ReactComponentName({}));
+        baseWebpackConfig.plugins.push(ReactComponentName({}));
       }
 
       // to fix shikiji compile error
       // refs: https://github.com/antfu/shikiji/issues/23
-      config.module.rules.push({
+      baseWebpackConfig.module.rules.push({
         resolve: {
           fullySpecified: false,
         },
@@ -347,14 +350,14 @@ export function defineConfig(config: CustomNextConfig) {
       });
 
       // https://github.com/pinojs/pino/issues/688#issuecomment-637763276
-      config.externals.push('pino-pretty');
+      baseWebpackConfig.externals.push('pino-pretty');
 
-      config.resolve.alias.canvas = false;
+      baseWebpackConfig.resolve.alias.canvas = false;
 
       // to ignore epub2 compile error
       // refs: https://github.com/lobehub/lobe-chat/discussions/6769
-      config.resolve.fallback = {
-        ...config.resolve.fallback,
+      baseWebpackConfig.resolve.fallback = {
+        ...baseWebpackConfig.resolve.fallback,
         zipfile: false,
       };
 
@@ -364,7 +367,7 @@ export function defineConfig(config: CustomNextConfig) {
       ) {
         // fix the Worker URL cross-origin issue
         // refs: https://github.com/lobehub/lobe-chat/pull/9624
-        config.module.rules.push({
+        baseWebpackConfig.module.rules.push({
           generator: {
             // @see https://webpack.js.org/configuration/module/#rulegeneratorpublicpath
             publicPath: '/_next/',
@@ -375,7 +378,13 @@ export function defineConfig(config: CustomNextConfig) {
         });
       }
 
-      return config;
+      const updatedConfig = baseWebpackConfig;
+
+      if (config.webpack) {
+        return config.webpack(updatedConfig, options);
+      }
+
+      return updatedConfig;
     },
   };
 

package/src/libs/next/proxy/define-config.ts

@@ -12,7 +12,6 @@ import { LOBE_THEME_APPEARANCE } from '@/const/theme';
 import { isDesktop } from '@/const/version';
 import { appEnv } from '@/envs/app';
 import { authEnv } from '@/envs/auth';
-import { oidcEnv } from '@/envs/oidc';
 import NextAuth from '@/libs/next-auth';
 import { type Locales } from '@/locales/resources';
 import { parseBrowserLanguage } from '@/utils/locale';
@@ -236,7 +235,7 @@ export function defineConfig() {
       response.headers.set(OAUTH_AUTHORIZED, 'true');
 
       // If OIDC is enabled and user is logged in, add OIDC session pre-sync header
-      if (oidcEnv.ENABLE_OIDC && session?.user?.id) {
+      if (authEnv.ENABLE_OIDC && session?.user?.id) {
         logNextAuth('OIDC session pre-sync: Setting %s = %s', OIDC_SESSION_HEADER, session.user.id);
         response.headers.set(OIDC_SESSION_HEADER, session.user.id);
       }
@@ -285,10 +284,10 @@ export function defineConfig() {
       });
 
       // If OIDC is enabled and Clerk user is logged in, add OIDC session pre-sync header
-      if (oidcEnv.ENABLE_OIDC && data.userId) {
+      if (authEnv.ENABLE_OIDC && data.userId) {
         logClerk('OIDC session pre-sync: Setting %s = %s', OIDC_SESSION_HEADER, data.userId);
         response.headers.set(OIDC_SESSION_HEADER, data.userId);
-      } else if (oidcEnv.ENABLE_OIDC) {
+      } else if (authEnv.ENABLE_OIDC) {
         logClerk('No Clerk user detected, not setting OIDC session sync header');
       }
 
@@ -351,7 +350,7 @@ export function defineConfig() {
     enableBetterAuth: authEnv.NEXT_PUBLIC_ENABLE_BETTER_AUTH,
     enableClerk: authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH,
     enableNextAuth: authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH,
-    enableOIDC: oidcEnv.ENABLE_OIDC,
+    enableOIDC: authEnv.ENABLE_OIDC,
   });
 
   return {

package/src/libs/trpc/lambda/context.ts

@@ -1,17 +1,17 @@
-import { type ClientSecretPayload } from '@lobechat/types';
-import { parse } from 'cookie';
-import debug from 'debug';
-import { type User } from 'next-auth';
-import { type NextRequest } from 'next/server';
-
 import {
   LOBE_CHAT_AUTH_HEADER,
   LOBE_CHAT_OIDC_AUTH_HEADER,
   enableBetterAuth,
   enableClerk,
   enableNextAuth,
-} from '@/const/auth';
-import { oidcEnv } from '@/envs/oidc';
+} from '@lobechat/const';
+import { type ClientSecretPayload } from '@lobechat/types';
+import { parse } from 'cookie';
+import debug from 'debug';
+import { type User } from 'next-auth';
+import { type NextRequest } from 'next/server';
+
+import { authEnv } from '@/envs/auth';
 import { ClerkAuth, type IClerkAuth } from '@/libs/clerk-auth';
 import { validateOIDCJWT } from '@/libs/oidc-provider/jwt';
 
@@ -129,11 +129,9 @@ export const createLambdaContext = async (request: NextRequest): Promise<LambdaC
   let oidcAuth = null;
 
   // Prioritize checking for OIDC authentication (both standard Authorization and custom Oidc-Auth headers)
-  if (oidcEnv.ENABLE_OIDC) {
+  if (authEnv.ENABLE_OIDC) {
     log('OIDC enabled, attempting OIDC authentication');
-    const standardAuthorization = request.headers.get('Authorization');
     const oidcAuthToken = request.headers.get(LOBE_CHAT_OIDC_AUTH_HEADER);
-    log('Standard Authorization header: %s', standardAuthorization ? 'exists' : 'not found');
     log('Oidc-Auth header: %s', oidcAuthToken ? 'exists' : 'not found');
 
     try {

package/src/server/services/oidc/oidcProvider.ts

@@ -1,5 +1,5 @@
 import { getDBInstance } from '@/database/core/web-server';
-import { oidcEnv } from '@/envs/oidc';
+import { authEnv } from '@/envs/auth';
 import { type OIDCProvider, createOIDCProvider } from '@/libs/oidc-provider/provider';
 
 /**
@@ -13,7 +13,7 @@ let provider: OIDCProvider;
  */
 export const getOIDCProvider = async (): Promise<OIDCProvider> => {
   if (!provider) {
-    if (!oidcEnv.ENABLE_OIDC) {
+    if (!authEnv.ENABLE_OIDC) {
       throw new Error('OIDC is not enabled. Set ENABLE_OIDC=1 to enable it.');
     }
 

package/src/services/chat/mecha/modelParamsResolver.ts

@@ -95,6 +95,17 @@ export const resolveModelExtendParams = (ctx: ModelParamsContext): ModelExtendPa
     extendParams.reasoning_effort = chatConfig.gpt5_1ReasoningEffort;
   }
 
+  if (modelExtendParams.includes('gpt5_2ReasoningEffort') && chatConfig.gpt5_2ReasoningEffort) {
+    extendParams.reasoning_effort = chatConfig.gpt5_2ReasoningEffort;
+  }
+
+  if (
+    modelExtendParams.includes('gpt5_2ProReasoningEffort') &&
+    chatConfig.gpt5_2ProReasoningEffort
+  ) {
+    extendParams.reasoning_effort = chatConfig.gpt5_2ProReasoningEffort;
+  }
+
   // Text verbosity
   if (modelExtendParams.includes('textVerbosity') && chatConfig.textVerbosity) {
     extendParams.verbosity = chatConfig.textVerbosity;

package/vercel.json

@@ -1,4 +1,4 @@
 {
-  "buildCommand": "bun run build",
+  "buildCommand": "bun run build:vercel",
   "installCommand": "npx bun@1.2.23 install"
 }

package/src/envs/oidc.ts

@@ -1,18 +0,0 @@
-import { createEnv } from '@t3-oss/env-nextjs';
-import { z } from 'zod';
-
-export const oidcEnv = createEnv({
-  client: {},
-  runtimeEnv: {
-    ENABLE_OIDC: process.env.ENABLE_OIDC === '1',
-    OIDC_JWKS_KEY: process.env.OIDC_JWKS_KEY,
-  },
-  server: {
-    // 是否启用 OIDC
-    ENABLE_OIDC: z.boolean().optional().default(false),
-    // OIDC 签名密钥
-    // 必须是一个包含私钥的 JWKS (JSON Web Key Set) 格式的 JSON 字符串。
-    // 可以使用 `node scripts/generate-oidc-jwk.mjs` 命令生成。
-    OIDC_JWKS_KEY: z.string().optional(),
-  },
-});