update

Author: arvinxx

src/app/(backend)/middleware/auth/index.ts

@@ -1,9 +1,9 @@
 import { AuthObject } from '@clerk/backend';
-import { getAuth } from '@clerk/nextjs/server';
 import { NextRequest } from 'next/server';
 
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableClerk } from '@/const/auth';
 import { AgentRuntime, AgentRuntimeError, ChatCompletionErrorPayload } from '@/libs/agent-runtime';
+import { ClerkAuth } from '@/libs/clerk-auth';
 import { ChatErrorType } from '@/types/fetch';
 import { createErrorResponse } from '@/utils/errorResponse';
 import { getJWTPayload } from '@/utils/server/jwt';
@@ -41,8 +41,11 @@ export const checkAuth =
       // check the Auth With payload and clerk auth
       let clerkAuth = {} as AuthObject;
 
+      // TODO: V2 完整移除 client 模式下的 clerk 集成代码
       if (enableClerk) {
-        clerkAuth = getAuth(req as NextRequest);
+        const auth = new ClerkAuth();
+        const data = auth.getAuthFromRequest(req as NextRequest);
+        clerkAuth = data.clerkAuth;
       }
 
       jwtPayload = await getJWTPayload(authorization);

src/app/[variants]/(main)/chat/(workspace)/@topic/features/SkeletonList.tsx

@@ -23,7 +23,7 @@ const useStyles = createStyles(({ css, prefixCls }) => ({
 
   paragraph: css`
     > li {
-      height: 24px !important;
+      height: 20px !important;
     }
   `,
 }));
@@ -49,7 +49,7 @@ export const Placeholder = memo(() => {
 
 export const SkeletonList = memo(() => (
   <Flexbox style={{ paddingTop: 6 }}>
-    {Array.from({ length: 6 }).map((_, i) => (
+    {Array.from({ length: 4 }).map((_, i) => (
       <Placeholder key={i} />
     ))}
   </Flexbox>

src/app/[variants]/(main)/chat/(workspace)/@topic/features/TopicListContent/SearchResult/index.tsx

@@ -0,0 +1,59 @@
+'use client';
+
+import { Typography } from 'antd';
+import isEqual from 'fast-deep-equal';
+import React, { memo, useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Center } from 'react-layout-kit';
+import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
+
+import { useChatStore } from '@/store/chat';
+import { topicSelectors } from '@/store/chat/selectors';
+import { ChatTopic } from '@/types/topic';
+
+import { SkeletonList } from '../../SkeletonList';
+import TopicItem from '../TopicItem';
+
+const SearchResult = memo(() => {
+  const { t } = useTranslation('topic');
+  const virtuosoRef = useRef<VirtuosoHandle>(null);
+  const [activeTopicId, isSearchingTopic] = useChatStore((s) => [
+    s.activeTopicId,
+    topicSelectors.isSearchingTopic(s),
+  ]);
+  const topics = useChatStore(topicSelectors.searchTopics, isEqual);
+
+  const itemContent = useCallback(
+    (index: number, { id, favorite, title }: ChatTopic) => (
+      <TopicItem active={activeTopicId === id} fav={favorite} id={id} key={id} title={title} />
+    ),
+    [activeTopicId],
+  );
+
+  const activeIndex = topics.findIndex((topic) => topic.id === activeTopicId);
+
+  if (isSearchingTopic) return <SkeletonList />;
+
+  if (topics.length === 0)
+    return (
+      <Center paddingBlock={12}>
+        <Typography.Text type={'secondary'}>{t('searchResultEmpty')}</Typography.Text>
+      </Center>
+    );
+
+  return (
+    <Virtuoso
+      computeItemKey={(_, item) => item.id}
+      data={topics}
+      defaultItemHeight={44}
+      initialTopMostItemIndex={Math.max(activeIndex, 0)}
+      itemContent={itemContent}
+      overscan={44 * 10}
+      ref={virtuosoRef}
+    />
+  );
+});
+
+SearchResult.displayName = 'SearchResult';
+
+export default SearchResult;

src/app/[variants]/(main)/chat/(workspace)/@topic/features/TopicListContent/index.tsx

@@ -2,7 +2,6 @@
 
 import { EmptyCard } from '@lobehub/ui';
 import { useThemeMode } from 'antd-style';
-import isEqual from 'fast-deep-equal';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
@@ -18,6 +17,7 @@ import { TopicDisplayMode } from '@/types/topic';
 import { SkeletonList } from '../SkeletonList';
 import ByTimeMode from './ByTimeMode';
 import FlatMode from './FlatMode';
+import SearchResult from './SearchResult';
 
 const TopicListContent = memo(() => {
   const { t } = useTranslation('topic');
@@ -26,7 +26,10 @@ const TopicListContent = memo(() => {
     s.topicsInit,
     topicSelectors.currentTopicLength(s),
   ]);
-  const activeTopicList = useChatStore(topicSelectors.displayTopics, isEqual);
+  const [isUndefinedTopics, isInSearchMode] = useChatStore((s) => [
+    topicSelectors.isUndefinedTopics(s),
+    topicSelectors.isInSearchMode(s),
+  ]);
 
   const [visible, updateGuideState, topicDisplayMode] = useUserStore((s) => [
     s.preference.guide?.topic,
@@ -36,8 +39,10 @@ const TopicListContent = memo(() => {
 
   useFetchTopics();
 
+  if (isInSearchMode) return <SearchResult />;
+
   // first time loading or has no data
-  if (!topicsInit || !activeTopicList) return <SkeletonList />;
+  if (!topicsInit || isUndefinedTopics) return <SkeletonList />;
 
   return (
     <>

src/app/[variants]/(main)/chat/(workspace)/@topic/features/TopicSearchBar/index.tsx

@@ -11,30 +11,44 @@ import { useServerConfigStore } from '@/store/serverConfig';
 const TopicSearchBar = memo<{ onClear?: () => void }>(({ onClear }) => {
   const { t } = useTranslation('topic');
 
-  const [keywords, setKeywords] = useState('');
+  const [tempValue, setTempValue] = useState('');
+  const [searchKeyword, setSearchKeywords] = useState('');
   const mobile = useServerConfigStore((s) => s.isMobile);
   const [activeSessionId, useSearchTopics] = useChatStore((s) => [s.activeId, s.useSearchTopics]);
 
-  useSearchTopics(keywords, activeSessionId);
+  useSearchTopics(searchKeyword, activeSessionId);
+
   useUnmount(() => {
-    useChatStore.setState({ isSearchingTopic: false });
+    useChatStore.setState({ inSearchingMode: false, isSearchingTopic: false });
   });
+
+  const startSearchTopic = () => {
+    if (tempValue === searchKeyword) return;
+
+    setSearchKeywords(tempValue);
+    useChatStore.setState({ inSearchingMode: !!tempValue, isSearchingTopic: !!tempValue });
+  };
+
   return (
     <SearchBar
       autoFocus
       onBlur={() => {
-        if (keywords === '') onClear?.();
+        if (tempValue === '') {
+          onClear?.();
+
+          return;
+        }
+
+        startSearchTopic();
       }}
       onChange={(e) => {
-        const value = e.target.value;
-
-        setKeywords(value);
-        useChatStore.setState({ isSearchingTopic: !!value });
+        setTempValue(e.target.value);
       }}
+      onPressEnter={startSearchTopic}
       placeholder={t('searchPlaceholder')}
       spotlight={!mobile}
       type={mobile ? 'block' : 'ghost'}
-      value={keywords}
+      value={tempValue}
     />
   );
 });

src/database/schemas/user.ts

@@ -39,9 +39,6 @@ export const userSettings = pgTable('user_settings', {
     .primaryKey(),
 
   tts: jsonb('tts'),
-  /**
-   * @deprecated
-   */
   keyVaults: text('key_vaults'),
   general: jsonb('general'),
   languageModel: jsonb('language_model'),

src/database/server/models/topic.ts

@@ -1,5 +1,5 @@
-import { Column, count, sql } from 'drizzle-orm';
-import { and, desc, eq, exists, gt, inArray, isNull, like, or } from 'drizzle-orm/expressions';
+import { count, sql } from 'drizzle-orm';
+import { and, desc, eq, gt, inArray, isNull, like } from 'drizzle-orm/expressions';
 
 import { LobeChatDatabase } from '@/database/type';
 import {
@@ -79,27 +79,57 @@ export class TopicModel {
 
     const keywordLowerCase = keyword.toLowerCase();
 
-    const matchKeyword = (field: any) =>
-      like(sql`lower(${field})` as unknown as Column, `%${keywordLowerCase}%`);
-
-    return this.db.query.topics.findMany({
+    // 查询标题匹配的主题
+    const topicsByTitle = await this.db.query.topics.findMany({
       orderBy: [desc(topics.updatedAt)],
       where: and(
         eq(topics.userId, this.userId),
         this.matchSession(sessionId),
-        or(
-          matchKeyword(topics.title),
-          exists(
-            this.db
-              .select()
-              .from(messages)
-              .where(and(eq(messages.topicId, topics.id), matchKeyword(messages.content))),
-          ),
-        ),
+        like(topics.title, `%${keywordLowerCase}%`),
       ),
     });
-  };
 
+    // 查询消息内容匹配的主题ID
+    const topicIdsByMessages = await this.db
+      .select({ topicId: messages.topicId })
+      .from(messages)
+      .innerJoin(topics, eq(messages.topicId, topics.id))
+      .where(
+        and(
+          eq(messages.userId, this.userId),
+          like(messages.content, `%${keywordLowerCase}%`),
+          eq(topics.userId, this.userId),
+          this.matchSession(sessionId),
+        ),
+      )
+      .groupBy(messages.topicId);
+    // 如果没有通过消息内容找到主题，直接返回标题匹配的主题
+    if (topicIdsByMessages.length === 0) {
+      return topicsByTitle;
+    }
+
+    // 查询通过消息内容找到的主题
+    const topicIds = topicIdsByMessages.map((t) => t.topicId);
+    const topicsByMessages = await this.db.query.topics.findMany({
+      orderBy: [desc(topics.updatedAt)],
+      where: and(eq(topics.userId, this.userId), inArray(topics.id, topicIds)),
+    });
+
+    // 合并结果并去重
+    const allTopics = [...topicsByTitle];
+    const existingIds = new Set(topicsByTitle.map((t) => t.id));
+
+    for (const topic of topicsByMessages) {
+      if (!existingIds.has(topic.id)) {
+        allTopics.push(topic);
+      }
+    }
+
+    // 按更新时间排序
+    return allTopics.sort(
+      (a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
+    );
+  };
   count = async (params?: {
     endDate?: string;
     range?: [string, string];

src/database/server/models/user.ts

@@ -174,15 +174,15 @@ export class UserModel {
     // if user already exists, skip creation
     if (params.id) {
       const user = await db.query.users.findFirst({ where: eq(users.id, params.id) });
-      if (!!user) return;
+      if (!!user) return { duplicate: true };
     }
 
     const [user] = await db
       .insert(users)
       .values({ ...params })
       .returning();
 
-    return user;
+    return { duplicate: false, user };
   };
 
   static deleteUser = async (db: LobeChatDatabase, id: string) => {