npm - @lobehub/chat - Versions diffs - 1.77.6 → 1.77.8 - Mend

@lobehub/chat 1.77.6 → 1.77.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (47) hide show

package/.github/scripts/pr-comment.js +80 -0
package/.github/scripts/pr-release-body.js +59 -0
package/.github/workflows/release-desktop.yml +331 -0
package/.github/workflows/test.yml +1 -1
package/CHANGELOG.md +58 -0
package/changelog/v1.json +21 -0
package/next.config.ts +16 -11
package/package.json +92 -89
package/packages/electron-client-ipc/README.md +48 -0
package/packages/electron-client-ipc/package.json +7 -0
package/packages/electron-client-ipc/src/events/devtools.ts +6 -0
package/packages/electron-client-ipc/src/events/index.ts +13 -0
package/packages/electron-client-ipc/src/index.ts +2 -0
package/packages/electron-client-ipc/src/types/dispatch.ts +10 -0
package/packages/electron-client-ipc/src/types/index.ts +1 -0
package/packages/electron-server-ipc/README.md +1 -1
package/packages/web-crawler/src/crawImpl/search1api.ts +20 -17
package/pnpm-workspace.yaml +1 -0
package/scripts/setup-test-postgres-db.sh +21 -0
package/src/app/desktop/devtools/page.tsx +89 -0
package/src/app/desktop/layout.tsx +31 -0
package/src/app/layout.tsx +11 -0
package/src/app/not-found.tsx +1 -0
package/src/const/desktop.ts +1 -0
package/src/const/version.ts +2 -0
package/src/database/client/db.ts +3 -10
package/src/database/models/__tests__/message.test.ts +97 -26
package/src/database/models/__tests__/session.test.ts +2 -0
package/src/database/models/drizzleMigration.ts +15 -0
package/src/database/models/message.ts +10 -5
package/src/database/models/user.ts +3 -0
package/src/features/ChatInput/ActionBar/Token/TokenTag.tsx +13 -3
package/src/features/DevPanel/features/FloatPanel.tsx +23 -6
package/src/features/User/UserPanel/index.tsx +10 -6
package/src/libs/trpc/middleware/userAuth.ts +10 -0
package/src/server/routers/tools/__tests__/search.test.ts +1 -0
package/src/server/translation.test.ts +72 -52
package/src/server/translation.ts +2 -11
package/src/services/electron/devtools.ts +9 -0
package/src/styles/electron.ts +14 -0
package/src/tools/web-browsing/Portal/Search/ResultList/SearchItem/index.tsx +3 -8
package/src/tools/web-browsing/Render/Search/SearchResult/ShowMore.tsx +2 -4
package/src/types/electron.ts +11 -0
package/src/utils/electron/dispatch.ts +10 -0
package/tsconfig.json +6 -6
package/vitest.config.ts +3 -1
package/vitest.server.config.ts +7 -3

package/src/app/desktop/layout.tsx ADDED Viewed

@@ -0,0 +1,31 @@
+import { notFound } from 'next/navigation';
+import { NuqsAdapter } from 'nuqs/adapters/next/app';
+import { ReactNode } from 'react';
+import { isDesktop } from '@/const/version';
+import GlobalLayout from '@/layout/GlobalProvider';
+import { ServerConfigStoreProvider } from '@/store/serverConfig/Provider';
+interface RootLayoutProps {
+  children: ReactNode;
+}
+const RootLayout = async ({ children }: RootLayoutProps) => {
+  if (!isDesktop) return notFound();
+  return (
+    <html dir="ltr" suppressHydrationWarning>
+      <body>
+        <NuqsAdapter>
+          <ServerConfigStoreProvider>
+            <GlobalLayout appearance={'auto'} isMobile={false} locale={''}>
+              {children}
+            </GlobalLayout>
+          </ServerConfigStoreProvider>
+        </NuqsAdapter>
+      </body>
+    </html>
+  );
+};
+export default RootLayout;

package/src/app/layout.tsx ADDED Viewed

@@ -0,0 +1,11 @@
+import { PropsWithChildren } from 'react';
+const Layout = ({ children }: PropsWithChildren) => {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  );
+};
+export default Layout;

package/src/app/not-found.tsx ADDED Viewed

	@@ -0,0 +1 @@
1	+ export { default } from '@/components/404';

package/src/const/desktop.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export const DESKTOP_USER_ID = 'DEFAULT_DESKTOP_USER';

package/src/const/version.ts CHANGED Viewed

@@ -7,6 +7,8 @@ export const CURRENT_VERSION = pkg.version;
 export const isServerMode = process.env.NEXT_PUBLIC_SERVICE_MODE === 'server';
 export const isUsePgliteDB = process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite';
+export const isDesktop = process.env.NEXT_PUBLIC_IS_DESKTOP_APP === '1';
 export const isDeprecatedEdition = !isServerMode && !isUsePgliteDB;
 // @ts-ignore

package/src/database/client/db.ts CHANGED Viewed

@@ -167,17 +167,10 @@ export class DatabaseManager {
       // if hash is the same, no need to migrate
       if (hash === cacheHash) {
         try {
+          const drizzleMigration = new DrizzleMigrationModel(this.db as any);
           // 检查数据库中是否存在表
-          // 这里使用 pg_tables 系统表查询用户表数量
-          const tablesResult = await this.db.execute(
-            sql`
-              SELECT COUNT(*) as table_count
-              FROM information_schema.tables
-              WHERE table_schema = 'public'
-            `,
-          );
-          const tableCount = parseInt((tablesResult.rows[0] as any).table_count || '0', 10);
+          const tableCount = await drizzleMigration.getTableCounts();
           // 如果表数量大于0，则认为数据库已正确初始化
           if (tableCount > 0) {

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/ChatInput/ActionBar/Token/TokenTag.tsx CHANGED Viewed

@@ -2,7 +2,7 @@ import { TokenTag, Tooltip } from '@lobehub/ui';
 import { Popover } from 'antd';
 import { useTheme } from 'antd-style';
 import numeral from 'numeral';
-import { memo } from 'react';
+import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
@@ -12,7 +12,7 @@ import { useTokenCount } from '@/hooks/useTokenCount';
 import { useAgentStore } from '@/store/agent';
 import { agentChatConfigSelectors, agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
-import { topicSelectors } from '@/store/chat/selectors';
+import { chatSelectors, topicSelectors } from '@/store/chat/selectors';
 import { useToolStore } from '@/store/tool';
 import { toolSelectors } from '@/store/tool/selectors';
@@ -41,6 +41,11 @@ const Token = memo<TokenTagProps>(({ total: messageString }) => {
     ];
   });
+  const [historyCount, enableHistoryCount] = useAgentStore((s) => [
+    agentChatConfigSelectors.historyCount(s),
+    agentChatConfigSelectors.enableHistoryCount(s),
+  ]);
   const maxTokens = useModelContextWindowTokens(model, provider);
   // Tool usage token
@@ -60,7 +65,12 @@ const Token = memo<TokenTagProps>(({ total: messageString }) => {
   // Chat usage token
   const inputTokenCount = useTokenCount(input);
-  const chatsToken = useTokenCount(messageString) + inputTokenCount;
+  const chatsString = useMemo(() => {
+    const chats = chatSelectors.mainAIChatsWithHistoryConfig(useChatStore.getState());
+    return chats.map(chat => chat.content).join('');
+  }, [messageString, historyCount, enableHistoryCount]);
+  const chatsToken = useTokenCount(chatsString) + inputTokenCount;
   // SystemRole token
   const systemRoleToken = useTokenCount(systemRole);

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

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