@lobehub/chat 1.79.6 → 1.79.8

package/src/middleware.ts

@@ -1,4 +1,5 @@
 import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';
+import debug from 'debug';
 import { NextRequest, NextResponse } from 'next/server';
 import { UAParser } from 'ua-parser-js';
 import urlJoin from 'url-join';
@@ -14,6 +15,15 @@ import { parseDefaultThemeFromCountry } from '@/utils/server/geo';
 import { RouteVariants } from '@/utils/server/routeVariants';
 
 import { OAUTH_AUTHORIZED } from './const/auth';
+import { oidcEnv } from './envs/oidc';
+
+// Create debug logger instances
+const logDefault = debug('lobe-middleware:default');
+const logNextAuth = debug('lobe-middleware:next-auth');
+const logClerk = debug('lobe-middleware:clerk');
+
+// OIDC session pre-sync constant
+const OIDC_SESSION_HEADER = 'x-oidc-session-sync';
 
 export const config = {
   matcher: [
@@ -37,19 +47,25 @@ export const config = {
     '/login(.*)',
     '/signup(.*)',
     '/next-auth/(.*)',
+    '/oauth(.*)',
+    '/oidc(.*)',
     // ↓ cloud ↓
   ],
 };
 
+const backendApiEndpoints = ['/api', '/trpc', '/webapi', '/oidc'];
+
 const defaultMiddleware = (request: NextRequest) => {
   const url = new URL(request.url);
+  logDefault('Processing request: %s %s', request.method, request.url);
 
   // skip all api requests
-  if (['/api', '/trpc', '/webapi'].some((path) => url.pathname.startsWith(path))) {
+  if (backendApiEndpoints.some((path) => url.pathname.startsWith(path))) {
+    logDefault('Skipping API request: %s', url.pathname);
     return NextResponse.next();
   }
 
-  // 1. 从 cookie 中读取用户偏好
+  // 1. Read user preferences from cookies
   const theme =
     request.cookies.get(LOBE_THEME_APPEARANCE)?.value || parseDefaultThemeFromCountry(request);
 
@@ -62,16 +78,36 @@ const defaultMiddleware = (request: NextRequest) => {
 
   const device = new UAParser(ua || '').getDevice();
 
-  // 2. 创建规范化的偏好值
+  logDefault('User preferences: %O', {
+    browserLanguage,
+    deviceType: device.type,
+    hasCookies: {
+      locale: !!request.cookies.get(LOBE_LOCALE_COOKIE)?.value,
+      theme: !!request.cookies.get(LOBE_THEME_APPEARANCE)?.value,
+    },
+    locale,
+    theme,
+  });
+
+  // 2. Create normalized preference values
   const route = RouteVariants.serializeVariants({
     isMobile: device.type === 'mobile',
     locale,
     theme,
   });
 
+  logDefault('Serialized route variant: %s', route);
+
   // if app is in docker, rewrite to self container
   // https://github.com/lobehub/lobe-chat/issues/5876
   if (appEnv.MIDDLEWARE_REWRITE_THROUGH_LOCAL) {
+    logDefault('Local container rewrite enabled: %O', {
+      host: '127.0.0.1',
+      original: url.toString(),
+      port: process.env.PORT || '3210',
+      protocol: 'http',
+    });
+
     url.protocol = 'http';
     url.host = '127.0.0.1';
     url.port = process.env.PORT || '3210';
@@ -86,7 +122,12 @@ const defaultMiddleware = (request: NextRequest) => {
     ? urlJoin(url.origin, nextPathname)
     : nextPathname;
 
-  console.log(`[rewrite] ${url.pathname} -> ${nextURL}`);
+  logDefault('URL rewrite: %O', {
+    isLocalRewrite: appEnv.MIDDLEWARE_REWRITE_THROUGH_LOCAL,
+    nextPathname: nextPathname,
+    nextURL: nextURL,
+    originalPathname: url.pathname,
+  });
 
   url.pathname = nextPathname;
 
@@ -95,6 +136,8 @@ const defaultMiddleware = (request: NextRequest) => {
 
 // Initialize an Edge compatible NextAuth middleware
 const nextAuthMiddleware = NextAuthEdge.auth((req) => {
+  logNextAuth('NextAuth middleware processing request: %s %s', req.method, req.url);
+
   const response = defaultMiddleware(req);
 
   // Just check if session exists
@@ -104,10 +147,25 @@ const nextAuthMiddleware = NextAuthEdge.auth((req) => {
   // refs: https://github.com/lobehub/lobe-chat/pull/1323
   const isLoggedIn = !!session?.expires;
 
+  logNextAuth('NextAuth session status: %O', {
+    expires: session?.expires,
+    isLoggedIn,
+    userId: session?.user?.id,
+  });
+
   // Remove & amend OAuth authorized header
   response.headers.delete(OAUTH_AUTHORIZED);
   if (isLoggedIn) {
+    logNextAuth('Setting auth header: %s = %s', OAUTH_AUTHORIZED, 'true');
     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) {
+      logNextAuth('OIDC session pre-sync: Setting %s = %s', OIDC_SESSION_HEADER, session.user.id);
+      response.headers.set(OIDC_SESSION_HEADER, session.user.id);
+    }
+  } else {
+    logNextAuth('Not logged in, no auth header set');
   }
 
   return response;
@@ -122,9 +180,33 @@ const isProtectedRoute = createRouteMatcher([
 
 const clerkAuthMiddleware = clerkMiddleware(
   async (auth, req) => {
-    if (isProtectedRoute(req)) await auth.protect();
+    logClerk('Clerk middleware processing request: %s %s', req.method, req.url);
+
+    const isProtected = isProtectedRoute(req);
+    logClerk('Route protection status: %s, %s', req.url, isProtected ? 'protected' : 'public');
+
+    if (isProtected) {
+      logClerk('Protecting route: %s', req.url);
+      await auth.protect();
+    }
 
-    return defaultMiddleware(req);
+    const response = defaultMiddleware(req);
+
+    const data = await auth();
+    logClerk('Clerk auth status: %O', {
+      isSignedIn: !!data.userId,
+      userId: data.userId,
+    });
+
+    // If OIDC is enabled and Clerk user is logged in, add OIDC session pre-sync header
+    if (oidcEnv.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) {
+      logClerk('No Clerk user detected, not setting OIDC session sync header');
+    }
+
+    return response;
   },
   {
     // https://github.com/lobehub/lobe-chat/pull/3084
@@ -134,6 +216,12 @@ const clerkAuthMiddleware = clerkMiddleware(
   },
 );
 
+logDefault('Middleware configuration: %O', {
+  enableClerk: authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH,
+  enableNextAuth: authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH,
+  enableOIDC: oidcEnv.ENABLE_OIDC,
+});
+
 export default authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH
   ? clerkAuthMiddleware
   : authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH

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

@@ -0,0 +1,29 @@
+import { createContextForInteractionDetails } from '@/libs/oidc-provider/http-adapter';
+import { OIDCProvider } from '@/libs/oidc-provider/provider';
+
+import { getOIDCProvider } from './oidcProvider';
+
+export class OIDCService {
+  private provider: OIDCProvider;
+
+  constructor(provider: OIDCProvider) {
+    this.provider = provider;
+  }
+  static async initialize() {
+    const provider = await getOIDCProvider();
+
+    return new OIDCService(provider);
+  }
+
+  async getInteractionDetails(uid: string) {
+    const { req, res } = await createContextForInteractionDetails(uid);
+    return this.provider.interactionDetails(req, res);
+  }
+
+  async getInteractionResult(uid: string, result: any) {
+    const { req, res } = await createContextForInteractionDetails(uid);
+    return this.provider.interactionResult(req, res, result, { mergeWithLastSubmission: true });
+  }
+}
+
+export { getOIDCProvider } from './oidcProvider';

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

@@ -0,0 +1,27 @@
+import { appEnv } from '@/config/app';
+import { getDBInstance } from '@/database/core/web-server';
+import { oidcEnv } from '@/envs/oidc';
+import { OIDCProvider, createOIDCProvider } from '@/libs/oidc-provider/provider';
+
+/**
+ * OIDC Provider 实例
+ */
+let provider: OIDCProvider;
+
+/**
+ * 获取 OIDC Provider 实例
+ * @returns OIDC Provider 实例
+ */
+export const getOIDCProvider = async (): Promise<OIDCProvider> => {
+  if (!provider) {
+    if (!oidcEnv.ENABLE_OIDC) {
+      throw new Error('OIDC is not enabled. Set ENABLE_OIDC=1 to enable it.');
+    }
+
+    const baseUrl = appEnv.APP_URL!;
+    const db = getDBInstance();
+    provider = await createOIDCProvider(db, baseUrl);
+  }
+
+  return provider;
+};

package/src/store/chat/slices/aiChat/actions/memory.ts

@@ -1,6 +1,7 @@
 import { StateCreator } from 'zustand/vanilla';
 
 import { chainSummaryHistory } from '@/chains/summaryHistory';
+import { TraceNameMap } from '@/const/trace';
 import { chatService } from '@/services/chat';
 import { topicService } from '@/services/topic';
 import { ChatStore } from '@/store/chat';
@@ -29,8 +30,12 @@ export const chatMemory: StateCreator<
       onFinish: async (text) => {
         historySummary = text;
       },
-
       params: { ...chainSummaryHistory(messages), model, provider, stream: false },
+      trace: {
+        sessionId: get().activeId,
+        topicId: get().activeTopicId,
+        traceName: TraceNameMap.SummaryHistoryMessages,
+      },
     });
 
     await topicService.updateTopic(topicId, {

package/src/types/hotkey.ts

@@ -1,8 +1,59 @@
-import { KeyMapEnum } from '@lobehub/ui/es/Hotkey';
-
 export const KeyEnum = {
-  ...KeyMapEnum,
+  Alt: 'alt',
+  Backquote: 'backquote',
+  // `
+  Backslash: 'backslash',
+  // \
+  Backspace: 'backspace',
+  BracketLeft: 'bracketleft',
+  // [
+  BracketRight: 'bracketright',
+  // ]
+  Comma: 'comma',
+  // ,
+  Ctrl: 'ctrl',
+  Down: 'down',
+  Enter: 'enter',
+  Equal: 'equal',
+  // =
+  Esc: 'esc',
+  Left: 'left',
+  LeftClick: 'left-click',
+  LeftDoubleClick: 'left-double-click',
+  Meta: 'meta',
+  // Command on Mac, Win on Win
+  MiddleClick: 'middle-click',
+  Minus: 'minus',
+  // -
+  Mod: 'mod',
+
   Number: '1-9',
+
+  // Command on Mac, Ctrl on Win
+  Period: 'period',
+
+  // .
+  Plus: 'equal',
+
+  // +
+  QuestionMark: 'slash',
+
+  // ?
+  Quote: 'quote',
+  // '
+  Right: 'right',
+  RightClick: 'right-click',
+  RightDoubleClick: 'right-double-click',
+
+  Semicolon: 'semicolon',
+  // ;
+  Shift: 'shift',
+
+  Slash: 'slash',
+  // /
+  Space: 'space',
+  Tab: 'tab',
+  Up: 'up',
 } as const;
 
 export const HotkeyEnum = {