@lobehub/chat 1.77.6 → 1.77.7

package/src/database/models/__tests__/message.test.ts

@@ -1660,7 +1660,15 @@ describe('MessageModel', () => {
 
   describe('getHeatmaps', () => {
     it('should return heatmap data for the last year', async () => {
-      const today = dayjs();
+      // 使用固定日期进行测试
+      vi.useFakeTimers();
+      const fixedDate = new Date('2023-04-07T13:00:00Z');
+      vi.setSystemTime(fixedDate);
+
+      const today = dayjs(fixedDate);
+      const twoDaysAgoDate = today.subtract(2, 'day').format('YYYY-MM-DD');
+      const oneDayAgoDate = today.subtract(1, 'day').format('YYYY-MM-DD');
+      const todayDate = today.format('YYYY-MM-DD');
 
       // 创建测试数据
       await serverDB.insert(messages).values([
@@ -1695,31 +1703,39 @@ describe('MessageModel', () => {
       expect(result.length).toBeLessThan(368);
 
       // 检查两天前的数据
-      const twoDaysAgo = result.find(
-        (item) => item.date === today.subtract(2, 'day').format('YYYY-MM-DD'),
-      );
+      const twoDaysAgo = result.find((item) => item.date === twoDaysAgoDate);
       expect(twoDaysAgo?.count).toBe(2);
       expect(twoDaysAgo?.level).toBe(1);
 
       // 检查一天前的数据
-      const oneDayAgo = result.find(
-        (item) => item.date === today.subtract(1, 'day').format('YYYY-MM-DD'),
-      );
+      const oneDayAgo = result.find((item) => item.date === oneDayAgoDate);
       expect(oneDayAgo?.count).toBe(1);
       expect(oneDayAgo?.level).toBe(1);
 
       // 检查今天的数据
-      const todayData = result.find((item) => item.date === today.format('YYYY-MM-DD'));
+      const todayData = result.find((item) => item.date === todayDate);
       expect(todayData?.count).toBe(0);
       expect(todayData?.level).toBe(0);
+
+      vi.useRealTimers();
     });
 
     it('should calculate correct levels based on message count', async () => {
-      const today = dayjs();
+      // 使用固定日期进行测试
+      vi.useFakeTimers();
+      const fixedDate = new Date('2023-05-15T12:00:00Z');
+      vi.setSystemTime(fixedDate);
+
+      const today = dayjs(fixedDate);
+      const fourDaysAgoDate = today.subtract(4, 'day').format('YYYY-MM-DD');
+      const threeDaysAgoDate = today.subtract(3, 'day').format('YYYY-MM-DD');
+      const twoDaysAgoDate = today.subtract(2, 'day').format('YYYY-MM-DD');
+      const oneDayAgoDate = today.subtract(1, 'day').format('YYYY-MM-DD');
+      const todayDate = today.format('YYYY-MM-DD');
 
       // 创建测试数据 - 不同数量的消息以测试不同的等级
       await serverDB.insert(messages).values([
-        // 1 message - level 0
+        // 1 message - level 1
         {
           id: '1',
           userId,
@@ -1727,7 +1743,7 @@ describe('MessageModel', () => {
           content: 'message 1',
           createdAt: today.subtract(4, 'day').toDate(),
         },
-        // 6 messages - level 1
+        // 6 messages - level 2
         ...Array(6)
           .fill(0)
           .map((_, i) => ({
@@ -1737,7 +1753,7 @@ describe('MessageModel', () => {
             content: `message 2-${i}`,
             createdAt: today.subtract(3, 'day').toDate(),
           })),
-        // 11 messages - level 2
+        // 11 messages - level 3
         ...Array(11)
           .fill(0)
           .map((_, i) => ({
@@ -1747,7 +1763,7 @@ describe('MessageModel', () => {
             content: `message 3-${i}`,
             createdAt: today.subtract(2, 'day').toDate(),
           })),
-        // 16 messages - level 3
+        // 16 messages - level 4
         ...Array(16)
           .fill(0)
           .map((_, i) => ({
@@ -1773,33 +1789,88 @@ describe('MessageModel', () => {
       const result = await messageModel.getHeatmaps();
 
       // 检查不同天数的等级
-      const fourDaysAgo = result.find(
-        (item) => item.date === today.subtract(4, 'day').format('YYYY-MM-DD'),
-      );
+      const fourDaysAgo = result.find((item) => item.date === fourDaysAgoDate);
       expect(fourDaysAgo?.count).toBe(1);
       expect(fourDaysAgo?.level).toBe(1);
 
-      const threeDaysAgo = result.find(
-        (item) => item.date === today.subtract(3, 'day').format('YYYY-MM-DD'),
-      );
+      const threeDaysAgo = result.find((item) => item.date === threeDaysAgoDate);
       expect(threeDaysAgo?.count).toBe(6);
       expect(threeDaysAgo?.level).toBe(2);
 
-      const twoDaysAgo = result.find(
-        (item) => item.date === today.subtract(2, 'day').format('YYYY-MM-DD'),
-      );
+      const twoDaysAgo = result.find((item) => item.date === twoDaysAgoDate);
       expect(twoDaysAgo?.count).toBe(11);
       expect(twoDaysAgo?.level).toBe(3);
 
-      const oneDayAgo = result.find(
-        (item) => item.date === today.subtract(1, 'day').format('YYYY-MM-DD'),
-      );
+      const oneDayAgo = result.find((item) => item.date === oneDayAgoDate);
       expect(oneDayAgo?.count).toBe(16);
       expect(oneDayAgo?.level).toBe(4);
 
-      const todayData = result.find((item) => item.date === today.format('YYYY-MM-DD'));
+      const todayData = result.find((item) => item.date === todayDate);
       expect(todayData?.count).toBe(21);
       expect(todayData?.level).toBe(4);
+
+      vi.useRealTimers();
+    });
+
+    it.skip('should return time count correctly when 19:00 time', async () => {
+      // 使用固定日期进行测试
+      vi.useFakeTimers();
+      const fixedDate = new Date('2025-04-02T19:00:00Z');
+      vi.setSystemTime(fixedDate);
+
+      const today = dayjs(fixedDate);
+      const twoDaysAgoDate = today.subtract(2, 'day').format('YYYY-MM-DD');
+      const oneDayAgoDate = today.subtract(1, 'day').format('YYYY-MM-DD');
+      const todayDate = today.format('YYYY-MM-DD');
+
+      // 创建测试数据
+      await serverDB.insert(messages).values([
+        {
+          id: '1',
+          userId,
+          role: 'user',
+          content: 'message 1',
+          createdAt: today.subtract(2, 'day').toDate(),
+        },
+        {
+          id: '2',
+          userId,
+          role: 'user',
+          content: 'message 2',
+          createdAt: today.subtract(2, 'day').toDate(),
+        },
+        {
+          id: '3',
+          userId,
+          role: 'user',
+          content: 'message 3',
+          createdAt: today.subtract(1, 'day').toDate(),
+        },
+      ]);
+
+      // 调用 getHeatmaps 方法
+      const result = await messageModel.getHeatmaps();
+
+      // 断言结果
+      expect(result.length).toBeGreaterThanOrEqual(366);
+      expect(result.length).toBeLessThan(368);
+
+      // 检查两天前的数据
+      const twoDaysAgo = result.find((item) => item.date === twoDaysAgoDate);
+      expect(twoDaysAgo?.count).toBe(2);
+      expect(twoDaysAgo?.level).toBe(1);
+
+      // 检查一天前的数据
+      const oneDayAgo = result.find((item) => item.date === oneDayAgoDate);
+      expect(oneDayAgo?.count).toBe(1);
+      expect(oneDayAgo?.level).toBe(1);
+
+      // 检查今天的数据
+      const todayData = result.find((item) => item.date === todayDate);
+      expect(todayData?.count).toBe(0);
+      expect(todayData?.level).toBe(0);
+
+      vi.useRealTimers();
     });
 
     it('should handle empty data', async () => {

package/src/database/models/__tests__/session.test.ts

@@ -894,7 +894,9 @@ describe('SessionModel', () => {
         await trx.insert(topics).values([
           { id: 't1', sessionId: '1', userId },
           { id: 't2', sessionId: '1', userId },
+          { id: 't6', sessionId: '1', userId },
           { id: 't3', sessionId: '2', userId },
+          { id: 't8', sessionId: '2', userId },
           { id: 't4', sessionId: '3', userId },
         ]);
       });

package/src/database/models/drizzleMigration.ts

@@ -1,3 +1,5 @@
+import { sql } from 'drizzle-orm';
+
 import { LobeChatDatabase } from '@/database/type';
 import { MigrationTableItem } from '@/types/clientDB';
 
@@ -8,6 +10,19 @@ export class DrizzleMigrationModel {
     this.db = db;
   }
 
+  getTableCounts = async () => {
+    // 这里使用 pg_tables 系统表查询用户表数量
+    const result = await this.db.execute(
+      sql`
+        SELECT COUNT(*) as table_count
+        FROM information_schema.tables
+        WHERE table_schema = 'public'
+      `,
+    );
+
+    return parseInt((result.rows[0] as any).table_count || '0');
+  };
+
   getMigrationList = async () => {
     const res = await this.db.execute(
       'SELECT * FROM "drizzle"."__drizzle_migrations" ORDER BY "created_at" DESC;',

package/src/database/models/message.ts

@@ -382,15 +382,20 @@ export class MessageModel {
       .orderBy(desc(sql`heatmaps_date`));
 
     const heatmapData: HeatmapsProps['data'] = [];
-    let currentDate = startDate;
+    let currentDate = startDate.clone();
+
+    const dateCountMap = new Map<string, number>();
+    for (const item of result) {
+      if (item?.date) {
+        const dateStr = dayjs(item.date as string).format('YYYY-MM-DD');
+        dateCountMap.set(dateStr, Number(item.count) || 0);
+      }
+    }
 
     while (currentDate.isBefore(endDate) || currentDate.isSame(endDate, 'day')) {
       const formattedDate = currentDate.format('YYYY-MM-DD');
-      const matchingResult = result.find(
-        (r) => r?.date && dayjs(r.date as string).format('YYYY-MM-DD') === formattedDate,
-      );
+      const count = dateCountMap.get(formattedDate) || 0;
 
-      const count = matchingResult ? matchingResult.count : 0;
       const levelCount = count > 0 ? Math.ceil(count / 5) : 0;
       const level = levelCount > 4 ? 4 : levelCount;
 

package/src/database/models/user.ts

@@ -177,6 +177,9 @@ export class UserModel {
   };
 
   // Static method
+  static makeSureUserExist = async (db: LobeChatDatabase, userId: string) => {
+    await db.insert(users).values({ id: userId }).onConflictDoNothing();
+  };
 
   static createUser = async (db: LobeChatDatabase, params: NewUser) => {
     // if user already exists, skip creation

package/src/features/DevPanel/features/FloatPanel.tsx

@@ -4,14 +4,16 @@ import { ActionIcon, FluentEmoji, Icon, SideNav } from '@lobehub/ui';
 import { FloatButton } from 'antd';
 import { createStyles } from 'antd-style';
 import { BugIcon, BugOff, XIcon } from 'lucide-react';
+import { usePathname } from 'next/navigation';
 import { ReactNode, memo, useEffect, useState } from 'react';
 import { Flexbox } from 'react-layout-kit';
 import { Rnd } from 'react-rnd';
 
 import { BRANDING_NAME } from '@/const/branding';
+import { isDesktop } from '@/const/version';
 
 // 定义样式
-const useStyles = createStyles(({ token, css, prefixCls }) => {
+export const useStyles = createStyles(({ token, css, prefixCls }) => {
   return {
     collapsed: css`
       pointer-events: none;
@@ -86,6 +88,7 @@ const CollapsibleFloatPanel = memo<CollapsibleFloatPanelProps>(({ items }) => {
   const [position, setPosition] = useState({ x: 100, y: 100 });
   const [size, setSize] = useState({ height: minHeight, width: minWidth });
 
+  const pathname = usePathname();
   useEffect(() => {
     try {
       const localStoragePosition = localStorage.getItem('debug-panel-position');
@@ -108,11 +111,25 @@ const CollapsibleFloatPanel = memo<CollapsibleFloatPanelProps>(({ items }) => {
 
   return (
     <>
-      <FloatButton
-        className={styles.floatButton}
-        icon={<Icon icon={isExpanded ? BugOff : BugIcon} />}
-        onClick={() => setIsExpanded(!isExpanded)}
-      />
+      {
+        // desktop devtools 下隐藏
+        pathname !== '/desktop/devtools' && (
+          <FloatButton
+            className={styles.floatButton}
+            icon={<Icon icon={isExpanded ? BugOff : BugIcon} />}
+            onClick={async () => {
+              if (isDesktop) {
+                const { electronDevtoolsService } = await import('@/services/electron/devtools');
+
+                await electronDevtoolsService.openDevtools();
+
+                return;
+              }
+              setIsExpanded(!isExpanded);
+            }}
+          />
+        )
+      }
       {isExpanded && (
         <Rnd
           bounds="window"

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

@@ -4,16 +4,20 @@ import { Popover } from 'antd';
 import { createStyles } from 'antd-style';
 import { PropsWithChildren, memo, useState } from 'react';
 
+import { isDesktop } from '@/const/version';
+
 import PanelContent from './PanelContent';
 import UpgradeBadge from './UpgradeBadge';
 import { useNewVersion } from './useNewVersion';
 
-const useStyles = createStyles(({ css }) => ({
-  popover: css`
-    inset-block-start: 8px !important;
-    inset-inline-start: 8px !important;
-  `,
-}));
+const useStyles = createStyles(({ css }) => {
+  return {
+    popover: css`
+      inset-block-start: ${isDesktop ? 24 : 8}px !important;
+      inset-inline-start: 8px !important;
+    `,
+  };
+});
 
 const UserPanel = memo<PropsWithChildren>(({ children }) => {
   const hasNewVersion = useNewVersion();

package/src/libs/trpc/middleware/userAuth.ts

@@ -1,11 +1,21 @@
 import { TRPCError } from '@trpc/server';
 
 import { enableClerk } from '@/const/auth';
+import { DESKTOP_USER_ID } from '@/const/desktop';
+import { isDesktop } from '@/const/version';
 
 import { trpc } from '../init';
 
 export const userAuth = trpc.middleware(async (opts) => {
   const { ctx } = opts;
+
+  if (isDesktop) {
+    return opts.next({
+      ctx: {
+        userId: DESKTOP_USER_ID,
+      },
+    });
+  }
   // `ctx.user` is nullable
   if (!ctx.userId) {
     if (enableClerk) {

package/src/server/routers/tools/__tests__/search.test.ts

@@ -21,6 +21,7 @@ vi.mock('@/config/tools', () => ({
 
 vi.mock('@/const/version', () => ({
   isServerMode: true,
+  isDesktop: false,
 }));
 
 const createCaller = createCallerFactory(searchRouter);

package/src/server/translation.test.ts

@@ -1,12 +1,9 @@
 // @vitest-environment node
 import { cookies } from 'next/headers';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { DEFAULT_LANG, LOBE_LOCALE_COOKIE } from '@/const/locale';
+import { DEFAULT_LANG } from '@/const/locale';
 import { normalizeLocale } from '@/locales/resources';
-import * as env from '@/utils/env';
 
 import { getLocale, translation } from './translation';
 
@@ -15,15 +12,6 @@ vi.mock('next/headers', () => ({
   cookies: vi.fn(),
 }));
 
-vi.mock('node:fs', () => ({
-  existsSync: vi.fn(),
-  readFileSync: vi.fn(),
-}));
-
-vi.mock('node:path', () => ({
-  join: vi.fn(),
-}));
-
 vi.mock('@/const/locale', () => ({
   DEFAULT_LANG: 'en-US',
   LOBE_LOCALE_COOKIE: 'LOBE_LOCALE',
@@ -37,6 +25,28 @@ vi.mock('@/utils/env', () => ({
   isDev: false,
 }));
 
+// 模拟动态导入结果
+const mockTranslations = {
+  key1: 'Value 1',
+  key2: 'Value 2 with {{param}}',
+  nested: { key: 'Nested value' },
+};
+
+const mockDefaultTranslations = {
+  key1: '默认值 1',
+  key2: '默认值 2 带 {{param}}',
+  nested: { key: '默认嵌套值' },
+};
+
+// 重写导入函数
+vi.mock('@/../locales/en-US/common.json', async () => {
+  return mockTranslations;
+});
+
+vi.mock('@/locales/default/common', async () => {
+  return mockDefaultTranslations;
+});
+
 describe('getLocale', () => {
   const mockCookieStore = {
     get: vi.fn(),
@@ -61,17 +71,12 @@ describe('getLocale', () => {
 });
 
 describe('translation', () => {
-  const mockTranslations = {
-    key1: 'Value 1',
-    key2: 'Value 2 with {{param}}',
-    nested: { key: 'Nested value' },
-  };
-
   beforeEach(() => {
     vi.clearAllMocks();
-    (fs.existsSync as any).mockReturnValue(true);
-    (fs.readFileSync as any).mockReturnValue(JSON.stringify(mockTranslations));
-    (path.join as any).mockImplementation((...args: any) => args.join('/'));
+    // 重置 import 模拟
+    vi.doMock('@/../locales/en-US/common.json', async () => {
+      return mockTranslations;
+    });
   });
 
   it('should return correct translation object', async () => {
@@ -88,43 +93,58 @@ describe('translation', () => {
     expect(t('nested.key')).toBe('Nested value');
   });
 
-  it('should return key if translation is not found', async () => {
+  it('should handle multiple parameters in translation string', async () => {
+    // 模拟多参数翻译
+    vi.doMock('@/../locales/en-US/common.json', async () => ({
+      multiParam: 'Hello {{name}}, you have {{count}} messages',
+    }));
+
     const { t } = await translation('common', 'en-US');
-    expect(t('nonexistent.key')).toBe('nonexistent.key');
+    expect(t('multiParam', { name: 'John', count: '5' })).toBe('Hello John, you have 5 messages');
   });
 
-  it('should use fallback language if specified locale file does not exist', async () => {
-    (fs.existsSync as any).mockReturnValueOnce(false);
-    await translation('common', 'nonexistent-LANG');
-    expect(fs.readFileSync).toHaveBeenCalledWith(
-      expect.stringContaining(`/${DEFAULT_LANG}/common.json`),
-      'utf8',
-    );
+  it('should handle different namespaces', async () => {
+    // 模拟另一个命名空间
+    vi.doMock('@/../locales/en-US/chat.json', async () => ({
+      welcome: 'Welcome to the chat',
+    }));
+
+    const { t } = await translation('chat', 'en-US');
+    expect(t('welcome')).toBe('Welcome to the chat');
   });
 
-  it('should use zh-CN in dev mode when fallback is needed', async () => {
-    (fs.existsSync as any).mockReturnValueOnce(false);
-    (env.isDev as unknown as boolean) = true;
-    await translation('common', 'nonexistent-LANG');
-    expect(fs.readFileSync).toHaveBeenCalledWith(
-      expect.stringContaining('/zh-CN/common.json'),
-      'utf8',
-    );
+  it('should handle deep nested objects in translations', async () => {
+    // 模拟深层嵌套对象
+    vi.doMock('@/../locales/en-US/common.json', async () => ({
+      very: {
+        deeply: {
+          nested: {
+            key: 'Found the nested value',
+          },
+        },
+      },
+    }));
+
+    const { t } = await translation('common', 'en-US');
+    expect(t('very.deeply.nested.key')).toBe('Found the nested value');
   });
 
-  it('should handle file reading errors', async () => {
-    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    (fs.readFileSync as any).mockImplementation(() => {
-      throw new Error('File read error');
-    });
+  it('should handle empty parameters object', async () => {
+    vi.doMock('@/../locales/en-US/common.json', async () => ({
+      simpleText: 'Just a simple text',
+    }));
 
-    const result = await translation('common', 'en-US');
-    expect(result.t('any.key')).toBe('any.key');
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Error while reading translation file',
-      expect.any(Error),
-    );
+    const { t } = await translation('common', 'en-US');
+    expect(t('simpleText', {})).toBe('Just a simple text');
+  });
 
-    consoleErrorSpy.mockRestore();
+  it('should handle missing parameters in translation string', async () => {
+    vi.doMock('@/../locales/en-US/common.json', async () => ({
+      withParam: 'Text with {{param}}',
+    }));
+
+    const { t } = await translation('common', 'en-US');
+    // 当缺少参数时应保留占位符
+    expect(t('withParam')).toBe('Text with {{param}}');
   });
 });

package/src/server/translation.ts

@@ -1,8 +1,6 @@
 'use server';
 
 import { get } from 'lodash-es';
-import { existsSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
 
 import { DEFAULT_LANG } from '@/const/locale';
 import { Locales, NS, normalizeLocale } from '@/locales/resources';
@@ -17,15 +15,8 @@ export const translation = async (ns: NS = 'common', hl: string) => {
   let i18ns = {};
   const lng = await getLocale(hl);
   try {
-    let filepath = join(process.cwd(), `locales/${normalizeLocale(lng)}/${ns}.json`);
-    const isExist = existsSync(filepath);
-    if (!isExist)
-      filepath = join(
-        process.cwd(),
-        `locales/${normalizeLocale(isDev ? 'zh-CN' : DEFAULT_LANG)}/${ns}.json`,
-      );
-    const file = readFileSync(filepath, 'utf8');
-    i18ns = JSON.parse(file);
+    if (isDev && lng === 'zh-CN') i18ns = await import(`@/locales/default/${ns}`);
+    i18ns = await import(`@/../locales/${normalizeLocale(lng)}/${ns}.json`);
   } catch (e) {
     console.error('Error while reading translation file', e);
   }

package/src/services/electron/devtools.ts

@@ -0,0 +1,9 @@
+import { dispatch } from '@/utils/electron/dispatch';
+
+class DevtoolsService {
+  async openDevtools(): Promise<void> {
+    return dispatch('openDevtools');
+  }
+}
+
+export const electronDevtoolsService = new DevtoolsService();

package/src/styles/electron.ts

@@ -0,0 +1,14 @@
+import { css, cx } from 'antd-style';
+
+export const draggable = cx(css`
+  -webkit-app-region: drag;
+`);
+
+export const nodrag = cx(css`
+  -webkit-app-region: no-drag;
+`);
+
+export const electronStylish = {
+  draggable,
+  nodrag,
+};

package/src/tools/web-browsing/Portal/Search/ResultList/SearchItem/index.tsx

@@ -16,25 +16,22 @@ const useStyles = createStyles(({ css, token }) => {
       flex: 1;
 
       padding: 8px;
+      border-radius: 8px;
 
       color: initial;
 
-      border-radius: 8px;
-
       &:hover {
         background: ${token.colorFillTertiary};
       }
     `,
     desc: css`
       overflow: hidden;
-
       display: -webkit-box;
       -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
 
       color: ${token.colorTextTertiary};
       text-overflow: ellipsis;
-
-      -webkit-line-clamp: 2;
     `,
     displayLink: css`
       color: ${token.colorTextQuaternary};
@@ -45,14 +42,12 @@ const useStyles = createStyles(({ css, token }) => {
     `,
     url: css`
       overflow: hidden;
-     { /* stylelint-disable-line */ }
       display: -webkit-box;
       -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
 
       color: ${token.colorTextDescription};
       text-overflow: ellipsis;
-
-      -webkit-line-clamp: 1;
     `,
   };
 });