@lobehub/lobehub 2.0.0-next.13 → 2.0.0-next.14

package/src/hooks/useInterceptingRoutes.test.ts

@@ -10,21 +10,27 @@ import { useSessionStore } from '@/store/session';
 import { useOpenChatSettings } from './useInterceptingRoutes';
 
 // Mocks
+const mockPush = vi.fn((href) => href);
 vi.mock('next/navigation', () => ({
   useRouter: vi.fn(() => ({
-    push: vi.fn((href) => href),
+    push: mockPush,
     replace: vi.fn((href) => href),
   })),
 }));
 vi.mock('nextjs-toploader/app', () => ({
   useRouter: vi.fn(() => ({
-    push: vi.fn((href) => href),
+    push: mockPush,
     replace: vi.fn((href) => href),
   })),
 }));
 vi.mock('@/hooks/useQuery', () => ({
   useQuery: vi.fn(() => ({})),
 }));
+vi.mock('@/hooks/useQueryRoute', () => ({
+  useQueryRoute: vi.fn(() => ({
+    push: mockPush,
+  })),
+}));
 vi.mock('@/hooks/useIsMobile', () => ({
   useIsMobile: vi.fn(),
 }));
@@ -36,20 +42,32 @@ vi.mock('@/store/global', () => ({
     setState: vi.fn(),
   },
 }));
+let isDeprecatedEdition = false;
+vi.mock('@/const/version', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/const/version')>();
+  return {
+    ...actual,
+    get isDeprecatedEdition() {
+      return isDeprecatedEdition;
+    },
+  };
+});
 
 describe('useOpenChatSettings', () => {
   it('should handle inbox session id correctly', () => {
+    isDeprecatedEdition = true;
     vi.mocked(useSessionStore).mockReturnValue(INBOX_SESSION_ID);
     const { result } = renderHook(() => useOpenChatSettings());
 
     expect(result.current()).toBe('/settings?active=agent'); // Assuming openSettings returns a function
+    isDeprecatedEdition = false;
   });
 
   it('should handle mobile route for chat settings', () => {
     vi.mocked(useSessionStore).mockReturnValue('123');
     vi.mocked(useIsMobile).mockReturnValue(true);
     const { result } = renderHook(() => useOpenChatSettings(ChatSettingsTabs.Meta));
-    expect(result.current()).toBe('/chat/settings?session=123');
+    expect(result.current()).toBe('/chat/settings');
   });
 
   it('should handle desktop route for chat settings with session and tab', () => {

package/src/libs/trpc/client/index.ts

@@ -1,5 +1,4 @@
 export { asyncClient } from './async';
 export * from './desktop';
-export { edgeClient } from './edge';
 export * from './lambda';
 export * from './tools';

package/src/libs/trpc/client/lambda.ts

@@ -22,10 +22,12 @@ const errorHandlingLink: TRPCLink<LambdaRouter> = () => {
         complete: () => observer.complete(),
         error: async (err) => {
           // Check if this is an abort error and should be ignored
-          const isAbortError = err.message.includes('aborted') || err.name === 'AbortError' || 
-                              err.cause?.name === 'AbortError' || 
-                              err.message.includes('signal is aborted without reason');
-          
+          const isAbortError =
+            err.message.includes('aborted') ||
+            err.name === 'AbortError' ||
+            err.cause?.name === 'AbortError' ||
+            err.message.includes('signal is aborted without reason');
+
           const showError = (op.context?.showNotification as boolean) ?? true;
           const status = err.data?.httpStatus as number;
 
@@ -50,7 +52,8 @@ const errorHandlingLink: TRPCLink<LambdaRouter> = () => {
               }
 
               default: {
-                fetchErrorNotification.error({ errorMessage: err.message, status });
+                if (fetchErrorNotification)
+                  fetchErrorNotification.error({ errorMessage: err.message, status });
               }
             }
           }

package/src/server/routers/desktop/mcp.ts

@@ -2,8 +2,6 @@ import { GetStreamableMcpServerManifestInputSchema } from '@lobechat/types';
 import debug from 'debug';
 import { z } from 'zod';
 
-import { isServerMode } from '@/const/version';
-import { passwordProcedure } from '@/libs/trpc/edge';
 import { authedProcedure, router } from '@/libs/trpc/lambda';
 import { mcpService } from '@/server/services/mcp';
 
@@ -24,7 +22,7 @@ const stdioParamsSchema = z.object({
   type: z.literal('stdio').default('stdio'),
 });
 
-const mcpProcedure = isServerMode ? authedProcedure : passwordProcedure;
+const mcpProcedure = authedProcedure;
 
 export const mcpRouter = router({
   getStdioMcpServerManifest: mcpProcedure.input(stdioParamsSchema).query(async ({ input }) => {

package/src/server/routers/lambda/config/index.test.ts

@@ -4,8 +4,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 /**
  * This file contains the root router of your tRPC-backend
  */
-import { createCallerFactory } from '@/libs/trpc/edge';
-import { AuthContext, createContextInner } from '@/libs/trpc/edge/context';
+import { createCallerFactory } from '@/libs/trpc/lambda';
+import { AuthContext, createContextInner } from '@/libs/trpc/lambda/context';
 
 import { configRouter } from './index';
 

package/src/server/routers/tools/mcp.ts

@@ -1,3 +1,4 @@
+import { isDesktop } from '@lobechat/const';
 import {
   GetStreamableMcpServerManifestInputSchema,
   StreamableHTTPAuthSchema,
@@ -5,8 +6,6 @@ import {
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
-import { isDesktop, isServerMode } from '@/const/version';
-import { passwordProcedure } from '@/libs/trpc/edge';
 import { authedProcedure, router } from '@/libs/trpc/lambda';
 import { mcpService } from '@/server/services/mcp';
 
@@ -38,7 +37,7 @@ const checkStdioEnvironment = (params: z.infer<typeof mcpClientParamsSchema>) =>
   }
 };
 
-const mcpProcedure = isServerMode ? authedProcedure : passwordProcedure;
+const mcpProcedure = authedProcedure;
 
 export const mcpRouter = router({
   getStreamableMcpServerManifest: mcpProcedure

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

@@ -23,13 +23,7 @@ vi.mock('@/server/services/search/impls/searxng/client');
 
 describe('searchRouter', () => {
   const mockContext = {
-    req: {
-      headers: {
-        authorization: 'Bearer mock-token',
-      },
-    },
-    authorizationHeader: 'Bearer mock-token',
-    jwtPayload: { userId: '1' },
+    userId: 'test-user-id',
   };
 
   beforeEach(() => {

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

@@ -1,12 +1,9 @@
-import { isServerMode } from '@lobechat/const';
 import { z } from 'zod';
 
-import { passwordProcedure } from '@/libs/trpc/edge';
 import { authedProcedure, router } from '@/libs/trpc/lambda';
 import { searchService } from '@/server/services/search';
 
-// TODO: password procedure 未来的处理方式可能要思考下
-const searchProcedure = isServerMode ? authedProcedure : passwordProcedure;
+const searchProcedure = authedProcedure;
 
 export const searchRouter = router({
   crawlPages: searchProcedure

package/src/services/__tests__/tool.test.ts

@@ -1,8 +1,5 @@
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { edgeClient } from '@/libs/trpc/client';
-import { globalHelpers } from '@/store/global/helpers';
-
 import { toolService } from '../tool';
 import openAPIV3 from './openai/OpenAPI_V3.json';
 import OpenAIPlugin from './openai/plugin.json';

package/src/services/aiModel/index.test.ts

@@ -1,10 +1,7 @@
 import { testService } from '~test-utils';
 
-import { ClientService } from './client';
 import { ServerService } from './server';
 
 describe('aiModelService', () => {
   testService(ServerService);
-
-  testService(ClientService);
 });

package/src/services/aiModel/index.ts

@@ -1,9 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-export const aiModelService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : new ClientService();
+export const aiModelService = new ServerService();

package/src/services/aiProvider/index.test.ts

@@ -1,10 +1,7 @@
 import { testService } from '~test-utils';
 
-import { ClientService } from './client';
 import { ServerService } from './server';
 
 describe('aiProviderService', () => {
   testService(ServerService);
-
-  testService(ClientService);
 });

package/src/services/aiProvider/index.ts

@@ -1,9 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-export const aiProviderService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : new ClientService();
+export const aiProviderService = new ServerService();

package/src/services/chatGroup/index.ts

@@ -1,12 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new ServerService();
-
-export const chatGroupService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const chatGroupService = new ServerService();

package/src/services/config.ts

@@ -1,23 +1,13 @@
-import { BRANDING_NAME, isDeprecatedEdition, isServerMode } from '@lobechat/const';
+import { BRANDING_NAME, isServerMode } from '@lobechat/const';
 import { downloadFile, exportJSONFile } from '@lobechat/utils/client';
 import dayjs from 'dayjs';
 
-import { CURRENT_CONFIG_VERSION } from '@/migrations';
 import { ImportPgDataStructure } from '@/types/export';
 
 import { exportService } from './export';
-import { configService as deprecatedExportService } from './export/_deprecated';
 
 class ConfigService {
   exportAll = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportAll();
-      const filename = `${BRANDING_NAME}-config-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-
     const { data, url } = await exportService.exportData();
     const filename = `${dayjs().format('YYYY-MM-DD-hh-mm')}_${BRANDING_NAME}-data.json`;
 
@@ -34,60 +24,6 @@ class ConfigService {
     exportJSONFile(result, filename);
   };
 
-  exportAgents = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportAgents();
-      const filename = `${BRANDING_NAME}-agents-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-  };
-
-  exportSingleAgent = async (agentId: string) => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const result = await deprecatedExportService.exportSingleAgent(agentId);
-      if (!result) return;
-
-      const filename = `${BRANDING_NAME}-${result.title}-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(result.config, filename);
-      return;
-    }
-  };
-
-  exportSessions = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportSessions();
-      const filename = `${BRANDING_NAME}-sessions-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-  };
-
-  exportSettings = async () => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const config = await deprecatedExportService.exportSessions();
-      const filename = `${BRANDING_NAME}-settings-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(config, filename);
-      return;
-    }
-  };
-
-  exportSingleSession = async (sessionId: string) => {
-    // TODO: remove this in V2
-    if (isDeprecatedEdition) {
-      const data = await deprecatedExportService.exportSingleSession(sessionId);
-      if (!data) return;
-
-      const filename = `${BRANDING_NAME}-${data.title}-v${CURRENT_CONFIG_VERSION}.json`;
-      exportJSONFile(data.config, filename);
-      return;
-    }
-  };
-
   private createDataStructure = async (
     data: any,
     mode: 'pglite' | 'postgres',

package/src/services/export/index.ts

@@ -1,6 +1,3 @@
-import { isServerMode } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-export const exportService = isServerMode ? new ServerService() : new ClientService();
+export const exportService = new ServerService();

package/src/services/file/index.ts

@@ -1,13 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const fileService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const fileService = new ServerService();

package/src/services/import/index.ts

@@ -1,9 +1,3 @@
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const importService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' ? new ServerService() : clientService;
+export const importService = new ServerService();

package/src/services/message/index.ts

@@ -1,13 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const messageService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const messageService = new ServerService();

package/src/services/plugin/index.ts

@@ -1,13 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const pluginService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const pluginService = new ServerService();

package/src/services/session/index.ts

@@ -1,13 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const sessionService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const sessionService = new ServerService();

package/src/services/tableViewer/client.ts

@@ -1,16 +1,13 @@
-import { clientDB } from '@/database/client/db';
-import { TableViewerRepo } from '@/database/repositories/tableViewer';
-import { BaseClientService } from '@/services/baseClientService';
-
-export class ClientService extends BaseClientService {
-  private get tableViewerRepo(): TableViewerRepo {
-    return new TableViewerRepo(clientDB as any, this.userId);
-  }
-
-  getAllTables = async () => this.tableViewerRepo.getAllTables();
-
-  getTableDetails = async (tableName: string) => this.tableViewerRepo.getTableDetails(tableName);
-
-  getTableData = async (tableName: string) =>
-    this.tableViewerRepo.getTableData(tableName, { page: 1, pageSize: 300 });
+export class ClientService {
+  getAllTables = async () => [];
+
+  getTableDetails = async (tableName: string) => {
+    console.log('getTableDetails:', tableName);
+    return [];
+  };
+
+  getTableData = async (tableName: string) => {
+    console.log('getTableData:', tableName);
+    return [];
+  };
 }

package/src/services/thread/index.ts

@@ -1,9 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-export const threadService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : new ClientService();
+export const threadService = new ServerService();

package/src/services/topic/index.ts

@@ -1,13 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const topicService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
+export const topicService = new ServerService();

package/src/services/user/index.ts

@@ -1,15 +1,3 @@
-import { isDesktop } from '@/const/version';
-
-import { ClientService as DeprecatedService } from './_deprecated';
-import { ClientService } from './client';
 import { ServerService } from './server';
 
-const clientService =
-  process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite' ? new ClientService() : new DeprecatedService();
-
-export const userService =
-  process.env.NEXT_PUBLIC_SERVICE_MODE === 'server' || isDesktop
-    ? new ServerService()
-    : clientService;
-
-export const userClientService = clientService;
+export const userService = new ServerService();