@lobehub/chat 1.42.5 → 1.43.0

package/src/database/utils/genWhere.ts

@@ -0,0 +1,39 @@
+import dayjs, { Dayjs } from 'dayjs';
+import { SQL } from 'drizzle-orm';
+import { and, gte, lte } from 'drizzle-orm/expressions';
+
+export const genWhere = (sqls: (SQL<any> | undefined)[]): SQL<any> | undefined => {
+  const where = sqls.filter(Boolean);
+  if (where.length > 1) return and(...where);
+  return where[0];
+};
+
+export const genStartDateWhere = (
+  date: string | undefined,
+  key: any,
+  format: (date: Dayjs) => any,
+): SQL | undefined => {
+  if (!date || !dayjs(date).isValid()) return;
+  return gte(key, format(dayjs(new Date(date))));
+};
+
+export const genEndDateWhere = (
+  date: string | undefined,
+  key: any,
+  format: (date: Dayjs) => any,
+): SQL | undefined => {
+  if (!date || !dayjs(date).isValid()) return;
+  return lte(key, format(dayjs(new Date(date)).add(1, 'day')));
+};
+
+export const genRangeWhere = (
+  range: [string, string] | undefined,
+  key: any,
+  format: (date: Dayjs) => any,
+): SQL | undefined => {
+  if (!range) return;
+  if (!dayjs(range[0]).isValid() && !dayjs(range[1]).isValid()) return;
+  if (!dayjs(range[0]).isValid()) return genEndDateWhere(range[1], key, format);
+  if (!dayjs(range[1]).isValid()) return genStartDateWhere(range[0], key, format);
+  return and(genStartDateWhere(range[0], key, format), genEndDateWhere(range[1], key, format));
+};

package/src/features/ShareModal/ShareImage/index.tsx

@@ -1,34 +1,17 @@
 import { Form, type FormItemProps } from '@lobehub/ui';
-import { Button, Segmented, SegmentedProps, Switch } from 'antd';
+import { Button, Segmented, Switch } from 'antd';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { useIsMobile } from '@/hooks/useIsMobile';
+import { ImageType, imageTypeOptions, useScreenshot } from '@/hooks/useScreenshot';
+import { useSessionStore } from '@/store/session';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 
 import Preview from './Preview';
-import { FieldType, ImageType } from './type';
-import { useScreenshot } from './useScreenshot';
-
-export const imageTypeOptions: SegmentedProps['options'] = [
-  {
-    label: 'JPG',
-    value: ImageType.JPG,
-  },
-  {
-    label: 'PNG',
-    value: ImageType.PNG,
-  },
-  {
-    label: 'SVG',
-    value: ImageType.SVG,
-  },
-  {
-    label: 'WEBP',
-    value: ImageType.WEBP,
-  },
-];
+import { FieldType } from './type';
 
 const DEFAULT_FIELD_VALUE: FieldType = {
   imageType: ImageType.JPG,
@@ -39,9 +22,13 @@ const DEFAULT_FIELD_VALUE: FieldType = {
 };
 
 const ShareImage = memo(() => {
+  const currentAgentTitle = useSessionStore(sessionMetaSelectors.currentAgentTitle);
   const [fieldValue, setFieldValue] = useState<FieldType>(DEFAULT_FIELD_VALUE);
-  const { t } = useTranslation('chat');
-  const { loading, onDownload, title } = useScreenshot(fieldValue.imageType);
+  const { t } = useTranslation(['chat', 'common']);
+  const { loading, onDownload, title } = useScreenshot({
+    imageType: fieldValue.imageType,
+    title: currentAgentTitle,
+  });
 
   const settings: FormItemProps[] = [
     {

package/src/features/ShareModal/ShareImage/type.ts

@@ -1,9 +1,4 @@
-export enum ImageType {
-  JPG = 'jpg',
-  PNG = 'png',
-  SVG = 'svg',
-  WEBP = 'webp',
-}
+import { ImageType } from '@/hooks/useScreenshot';
 
 export type FieldType = {
   imageType: ImageType;

package/src/features/User/DataStatistics.tsx

@@ -3,17 +3,18 @@
 import { Icon, Tooltip } from '@lobehub/ui';
 import { Badge } from 'antd';
 import { createStyles } from 'antd-style';
-import { isNumber } from 'lodash-es';
+import { isNumber, isUndefined } from 'lodash-es';
 import { LoaderCircle } from 'lucide-react';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox, FlexboxProps } from 'react-layout-kit';
-import useSWR from 'swr';
 
+import { useClientDataSWR } from '@/libs/swr';
 import { messageService } from '@/services/message';
 import { sessionService } from '@/services/session';
 import { topicService } from '@/services/topic';
 import { useServerConfigStore } from '@/store/serverConfig';
+import { today } from '@/utils/time';
 
 const useStyles = createStyles(({ css, token }) => ({
   card: css`
@@ -21,6 +22,10 @@ const useStyles = createStyles(({ css, token }) => ({
     padding-inline: 8px;
     background: ${token.colorFillTertiary};
     border-radius: ${token.borderRadius}px;
+
+    &:hover {
+      background: ${token.colorFillSecondary};
+    }
   `,
   count: css`
     font-size: 16px;
@@ -57,21 +62,23 @@ const formatNumber = (num: any) => {
 const DataStatistics = memo<Omit<FlexboxProps, 'children'>>(({ style, ...rest }) => {
   const mobile = useServerConfigStore((s) => s.isMobile);
   // sessions
-  const { data: sessions, isLoading: sessionsLoading } = useSWR(
-    'count-sessions',
-    sessionService.countSessions,
+  const { data: sessions, isLoading: sessionsLoading } = useClientDataSWR('count-sessions', () =>
+    sessionService.countSessions(),
   );
   // topics
-  const { data: topics, isLoading: topicsLoading } = useSWR(
-    'count-topics',
-    topicService.countTopics,
+  const { data: topics, isLoading: topicsLoading } = useClientDataSWR('count-topics', () =>
+    topicService.countTopics(),
   );
   // messages
-  const { data: messages, isLoading: messagesLoading } = useSWR(
+  const { data: { messages, messagesToday } = {}, isLoading: messagesLoading } = useClientDataSWR(
     'count-messages',
-    messageService.countMessages,
+    async () => ({
+      messages: await messageService.countMessages(),
+      messagesToday: await messageService.countMessages({
+        startDate: today().format('YYYY-MM-DD'),
+      }),
+    }),
   );
-  const { data: messagesToday } = useSWR('today-messages', messageService.countTodayMessages);
 
   const { styles, theme } = useStyles();
   const { t } = useTranslation('common');
@@ -80,17 +87,17 @@ const DataStatistics = memo<Omit<FlexboxProps, 'children'>>(({ style, ...rest })
 
   const items = [
     {
-      count: sessionsLoading ? loading : sessions,
+      count: sessionsLoading || isUndefined(sessions) ? loading : sessions,
       key: 'sessions',
       title: t('dataStatistics.sessions'),
     },
     {
-      count: topicsLoading ? loading : topics,
+      count: topicsLoading || isUndefined(topics) ? loading : topics,
       key: 'topics',
       title: t('dataStatistics.topics'),
     },
     {
-      count: messagesLoading ? loading : messages,
+      count: messagesLoading || isUndefined(messages) ? loading : messages,
       countToady: messagesToday,
       key: 'messages',
       title: t('dataStatistics.messages'),

package/src/features/User/UserPanel/PanelContent.tsx

@@ -1,9 +1,11 @@
+import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import BrandWatermark from '@/components/BrandWatermark';
 import Menu from '@/components/Menu';
+import { isDeprecatedEdition } from '@/const/version';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
 
@@ -17,21 +19,14 @@ import { useMenu } from './useMenu';
 const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => {
   const router = useRouter();
   const isLoginWithAuth = useUserStore(authSelectors.isLoginWithAuth);
-  const [openSignIn, signOut, openUserProfile, enableAuth, enabledNextAuth] = useUserStore((s) => [
+  const [openSignIn, signOut, enableAuth, enabledNextAuth] = useUserStore((s) => [
     s.openLogin,
     s.logout,
-    s.openUserProfile,
     s.enableAuth(),
     s.enabledNextAuth,
   ]);
   const { mainItems, logoutItems } = useMenu();
 
-  const handleOpenProfile = () => {
-    if (!enableAuth) return;
-    openUserProfile();
-    closePopover();
-  };
-
   const handleSignIn = () => {
     openSignIn();
     closePopover();
@@ -47,15 +42,16 @@ const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => {
 
   return (
     <Flexbox gap={2} style={{ minWidth: 300 }}>
-      {!enableAuth ? (
-        <>
-          <UserInfo />
-          <DataStatistics />
-        </>
-      ) : isLoginWithAuth ? (
+      {!enableAuth || (enableAuth && isLoginWithAuth) ? (
         <>
-          <UserInfo onClick={handleOpenProfile} />
-          <DataStatistics />
+          <Link href={'/profile'} style={{ color: 'inherit' }}>
+            <UserInfo />
+          </Link>
+          {!isDeprecatedEdition && (
+            <Link href={'/profile/stats'} style={{ color: 'inherit' }}>
+              <DataStatistics />
+            </Link>
+          )}
         </>
       ) : (
         <UserLoginOrSignup onClick={handleSignIn} />

package/src/features/User/UserPanel/useMenu.tsx

@@ -68,19 +68,17 @@ export const useMenu = () => {
   const hasNewVersion = useNewVersion();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
-  const [isLogin, isLoginWithAuth, isLoginWithClerk, openUserProfile] = useUserStore((s) => [
+  const [enableAuth, isLogin, isLoginWithAuth] = useUserStore((s) => [
+    authSelectors.enabledAuth(s),
     authSelectors.isLogin(s),
     authSelectors.isLoginWithAuth(s),
-    authSelectors.isLoginWithClerk(s),
-    s.openUserProfile,
   ]);
 
   const profile: MenuProps['items'] = [
     {
       icon: <Icon icon={CircleUserRound} />,
       key: 'profile',
-      label: t('userPanel.profile'),
-      onClick: () => openUserProfile(),
+      label: <Link href={'/profile'}>{t('userPanel.profile')}</Link>,
     },
   ];
 
@@ -227,7 +225,7 @@ export const useMenu = () => {
     {
       type: 'divider',
     },
-    ...(isLoginWithClerk ? profile : []),
+    ...(!enableAuth || (enableAuth && isLoginWithAuth) ? profile : []),
     ...(isLogin ? settings : []),
     /* ↓ cloud slot ↓ */
 

package/src/features/User/__tests__/PanelContent.test.tsx

@@ -61,6 +61,10 @@ vi.mock('../DataStatistics', () => ({
   default: vi.fn(() => <div>Mocked DataStatistics</div>),
 }));
 
+vi.mock('@/const/version', () => ({
+  isDeprecatedEdition: false,
+}));
+
 // 定义一个变量来存储 enableAuth 的值
 let enableAuth = true;
 

package/src/features/User/__tests__/useMenu.test.tsx

@@ -76,26 +76,6 @@ describe('useMenu', () => {
 
     const { result } = renderHook(() => useMenu(), { wrapper });
 
-    act(() => {
-      const { mainItems, logoutItems } = result.current;
-      expect(mainItems?.some((item) => item?.key === 'profile')).toBe(false);
-      expect(mainItems?.some((item) => item?.key === 'setting')).toBe(true);
-      expect(mainItems?.some((item) => item?.key === 'import')).toBe(true);
-      expect(mainItems?.some((item) => item?.key === 'export')).toBe(true);
-      expect(mainItems?.some((item) => item?.key === 'changelog')).toBe(true);
-      expect(logoutItems.some((item) => item?.key === 'logout')).toBe(true);
-    });
-  });
-
-  it('should provide correct menu items when user is logged in with Clerk', () => {
-    act(() => {
-      useUserStore.setState({ isSignedIn: true });
-    });
-    enableAuth = true;
-    enableClerk = true;
-
-    const { result } = renderHook(() => useMenu(), { wrapper });
-
     act(() => {
       const { mainItems, logoutItems } = result.current;
       expect(mainItems?.some((item) => item?.key === 'profile')).toBe(true);
@@ -117,7 +97,7 @@ describe('useMenu', () => {
 
     act(() => {
       const { mainItems, logoutItems } = result.current;
-      expect(mainItems?.some((item) => item?.key === 'profile')).toBe(false);
+      expect(mainItems?.some((item) => item?.key === 'profile')).toBe(true);
       expect(mainItems?.some((item) => item?.key === 'setting')).toBe(true);
       expect(mainItems?.some((item) => item?.key === 'import')).toBe(true);
       expect(mainItems?.some((item) => item?.key === 'export')).toBe(true);

package/src/hooks/useActiveTabKey.ts

@@ -1,6 +1,7 @@
 import { usePathname } from 'next/navigation';
 
-import { SidebarTabKey } from '@/store/global/initialState';
+import { useQuery } from '@/hooks/useQuery';
+import { ProfileTabs, SettingsTabs, SidebarTabKey } from '@/store/global/initialState';
 
 /**
  * Returns the active tab key (chat/market/settings/...)
@@ -10,3 +11,35 @@ export const useActiveTabKey = () => {
 
   return pathname.split('/').find(Boolean)! as SidebarTabKey;
 };
+
+/**
+ * Returns the active setting page key (common/sync/agent/...)
+ */
+export const useActiveSettingsKey = () => {
+  const pathname = usePathname();
+  const { tab } = useQuery();
+
+  const tabs = pathname.split('/').at(-1);
+
+  if (tabs === 'settings') return SettingsTabs.Common;
+
+  if (tabs === 'modal') return tab as SettingsTabs;
+
+  return tabs as SettingsTabs;
+};
+
+/**
+ * Returns the active profile page key (profile/security/stats/...)
+ */
+export const useActiveProfileKey = () => {
+  const pathname = usePathname();
+  const { tab } = useQuery();
+
+  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/{features/ShareModal/ShareImage → hooks}/useScreenshot.ts

@@ -1,16 +1,48 @@
+import { SegmentedProps } from 'antd';
 import dayjs from 'dayjs';
 import { domToJpeg, domToPng, domToSvg, domToWebp } from 'modern-screenshot';
 import { useCallback, useState } from 'react';
 
 import { BRANDING_NAME } from '@/const/branding';
-import { useSessionStore } from '@/store/session';
-import { sessionMetaSelectors } from '@/store/session/selectors';
 
-import { ImageType } from './type';
+export enum ImageType {
+  JPG = 'jpg',
+  PNG = 'png',
+  SVG = 'svg',
+  WEBP = 'webp',
+}
 
-export const useScreenshot = (imageType: ImageType) => {
+export const imageTypeOptions: SegmentedProps['options'] = [
+  {
+    label: 'JPG',
+    value: ImageType.JPG,
+  },
+  {
+    label: 'PNG',
+    value: ImageType.PNG,
+  },
+  {
+    label: 'SVG',
+    value: ImageType.SVG,
+  },
+  {
+    label: 'WEBP',
+    value: ImageType.WEBP,
+  },
+];
+
+export const useScreenshot = ({
+  imageType,
+  title = 'share',
+  id = '#preview',
+  width,
+}: {
+  id?: string;
+  imageType: ImageType;
+  title?: string;
+  width?: number;
+}) => {
   const [loading, setLoading] = useState(false);
-  const title = useSessionStore(sessionMetaSelectors.currentAgentTitle);
 
   const handleDownload = useCallback(async () => {
     setLoading(true);
@@ -35,13 +67,26 @@ export const useScreenshot = (imageType: ImageType) => {
         }
       }
 
-      const dataUrl = await screenshotFn(document.querySelector('#preview') as HTMLDivElement, {
+      const dom: HTMLDivElement = document.querySelector(id) as HTMLDivElement;
+      let copy: HTMLDivElement = dom;
+
+      if (width) {
+        copy = dom.cloneNode(true) as HTMLDivElement;
+        copy.style.width = `${width}px`;
+        document.body.append(copy);
+      }
+
+      const dataUrl = await screenshotFn(width ? copy : dom, {
         features: {
           // 不启用移除控制符，否则会导致 safari emoji 报错
           removeControlCharacter: false,
         },
         scale: 2,
+        width,
       });
+
+      if (width && copy) copy?.remove();
+
       const link = document.createElement('a');
       link.download = `${BRANDING_NAME}_${title}_${dayjs().format('YYYY-MM-DD')}.${imageType}`;
       link.href = dataUrl;

package/src/locales/default/auth.ts

@@ -1,8 +1,80 @@
 export default {
+  date: {
+    prevMonth: '上个月',
+    recent30Days: '最近30天',
+  },
+  header: {
+    desc: '管理您的账户信息。',
+    title: '账户',
+  },
+  heatmaps: {
+    legend: {
+      less: '不活跃',
+      more: '活跃',
+    },
+    months: {
+      apr: '四月',
+      aug: '八月',
+      dec: '十二月',
+      feb: '二月',
+      jan: '一月',
+      jul: '七月',
+      jun: '六月',
+      mar: '三月',
+      may: '五月',
+      nov: '十一月',
+      oct: '十月',
+      sep: '九月',
+    },
+    tooltip: '{{date}} 当日发送 {{count}} 条消息',
+    totalCount: '过去一年共发送 {{count}} 条消息',
+  },
   login: '登录',
   loginOrSignup: '登录 / 注册',
-  profile: '个人资料',
-  security: '安全',
+  profile: {
+    avatar: '头像',
+    email: '电子邮件地址',
+    username: '用户名',
+  },
   signout: '退出登录',
   signup: '注册',
+  stats: {
+    aiheatmaps: 'AI 指数',
+    assistants: '助手数',
+    assistantsRank: {
+      left: '助手名称',
+      right: '话题数',
+      title: '助手使用率',
+    },
+    createdAt: '用户创建于',
+    days: '天',
+    empty: {
+      desc: '请积累更多聊天数据后查看',
+      title: '暂无数据',
+    },
+    lastYearActivity: '过去一年活跃度',
+    messages: '消息数',
+    modelsRank: {
+      left: '模型名称',
+      right: '消息数',
+      title: '模型使用率',
+    },
+    share: {
+      title: '我的 AI 活跃指数',
+    },
+    topics: '话题数',
+    topicsRank: {
+      left: '话题名称',
+      right: '消息数',
+      title: '话题内容量',
+    },
+    updatedAt: '数据更新至',
+    welcome: '{{username}}, 这是你和 {{appName}} 相伴的第 <span>{{days}}</span> 天',
+    words: '累计字数',
+  },
+  tab: {
+    profile: '个人资料',
+    security: '安全',
+    stats: '数据统计',
+  },
 };

package/src/server/ld.test.ts

@@ -29,7 +29,7 @@ describe('Ld', () => {
 
       expect(org['@type']).toBe('Organization');
       expect(org.name).toBe('LobeHub');
-      expect(org.url).toBe('https://lobehub.com/');
+      expect(org.url).toBe('https://lobehub.com');
     });
   });
 

package/src/server/modules/AssistantStore/index.ts

@@ -36,7 +36,7 @@ export class AssistantStore {
       }
 
       if (!res.ok) {
-        console.error('fetch agent index error:', await res.text());
+        console.warn('fetch agent index error:', await res.text());
         return [];
       }
 
@@ -55,7 +55,8 @@ export class AssistantStore {
 
       return data;
     } catch (e) {
-      console.error('fetch agent index error:', e);
+      console.error('[AgentIndexFetchError] failed to fetch agent index, error detail:');
+      console.error(e);
 
       throw e;
     }

package/src/server/routers/lambda/message.ts

@@ -27,12 +27,33 @@ export const messageRouter = router({
       return { added: data.rowCount as number, ids: [], skips: [], success: true };
     }),
 
-  count: messageProcedure.query(async ({ ctx }) => {
-    return ctx.messageModel.count();
-  }),
-  countToday: messageProcedure.query(async ({ ctx }) => {
-    return ctx.messageModel.countToday();
-  }),
+  count: messageProcedure
+    .input(
+      z
+        .object({
+          endDate: z.string().optional(),
+          range: z.tuple([z.string(), z.string()]).optional(),
+          startDate: z.string().optional(),
+        })
+        .optional(),
+    )
+    .query(async ({ ctx, input }) => {
+      return ctx.messageModel.count(input);
+    }),
+
+  countWords: messageProcedure
+    .input(
+      z
+        .object({
+          endDate: z.string().optional(),
+          range: z.tuple([z.string(), z.string()]).optional(),
+          startDate: z.string().optional(),
+        })
+        .optional(),
+    )
+    .query(async ({ ctx, input }) => {
+      return ctx.messageModel.countWords(input);
+    }),
 
   createMessage: messageProcedure
     .input(z.object({}).passthrough().partial())
@@ -56,6 +77,10 @@ export const messageRouter = router({
       return ctx.messageModel.queryBySessionId(input.sessionId);
     }),
 
+  getHeatmaps: messageProcedure.query(async ({ ctx }) => {
+    return ctx.messageModel.getHeatmaps();
+  }),
+
   // TODO: 未来这部分方法也需要使用 authedProcedure
   getMessages: publicProcedure
     .input(
@@ -74,6 +99,10 @@ export const messageRouter = router({
       return messageModel.query(input, { postProcessUrl: (path) => getFullFileUrl(path) });
     }),
 
+  rankModels: messageProcedure.query(async ({ ctx }) => {
+    return ctx.messageModel.rankModels();
+  }),
+
   removeAllMessages: messageProcedure.mutation(async ({ ctx }) => {
     return ctx.messageModel.deleteAllMessages();
   }),

package/src/server/routers/lambda/session.ts

@@ -57,9 +57,19 @@ export const sessionRouter = router({
       return data?.id;
     }),
 
-  countSessions: sessionProcedure.query(async ({ ctx }) => {
-    return ctx.sessionModel.count();
-  }),
+  countSessions: sessionProcedure
+    .input(
+      z
+        .object({
+          endDate: z.string().optional(),
+          range: z.tuple([z.string(), z.string()]).optional(),
+          startDate: z.string().optional(),
+        })
+        .optional(),
+    )
+    .query(async ({ ctx, input }) => {
+      return ctx.sessionModel.count(input);
+    }),
 
   createSession: sessionProcedure
     .input(
@@ -103,6 +113,10 @@ export const sessionRouter = router({
       return ctx.sessionModel.query({ current, pageSize });
     }),
 
+  rankSessions: sessionProcedure.input(z.number().optional()).query(async ({ ctx, input }) => {
+    return ctx.sessionModel.rank(input);
+  }),
+
   removeAllSessions: sessionProcedure.mutation(async ({ ctx }) => {
     return ctx.sessionModel.deleteAll();
   }),