@lobehub/chat 0.147.15 → 0.147.17

package/src/layout/{GlobalLayout/Desktop/index.tsx → routes/Desktop.tsx}

@@ -3,14 +3,16 @@
 import { usePathname } from 'next/navigation';
 import { PropsWithChildren, memo } from 'react';
 
-import Client from './Client';
+import { DefaultLayoutDesktop } from '@/layout/DefaultLayout';
+
+const defaultLayoutRoutes = new Set(['/']);
 
 const DesktopLayout = memo<PropsWithChildren>(({ children }) => {
   const pathname = usePathname();
 
-  if (pathname === '/') return children;
+  if (defaultLayoutRoutes.has(pathname)) return children;
 
-  return <Client>{children}</Client>;
+  return <DefaultLayoutDesktop>{children}</DefaultLayoutDesktop>;
 });
 
 export default DesktopLayout;

package/src/layout/{GlobalLayout/Mobile/index.tsx → routes/Mobile.tsx}

@@ -5,8 +5,7 @@ import { PropsWithChildren, memo } from 'react';
 
 import { useActiveTabKey } from '@/hooks/useActiveTabKey';
 import { useIsSubSlug } from '@/hooks/useIsSubSlug';
-
-import Layout from './Client';
+import { DefaultLayoutMobile } from '@/layout/DefaultLayout';
 
 const MobileLayout = memo<PropsWithChildren>(({ children }) => {
   const pathname = usePathname();
@@ -16,9 +15,9 @@ const MobileLayout = memo<PropsWithChildren>(({ children }) => {
   if (pathname === '/') return children;
 
   return (
-    <Layout showTabBar={!isSubPath} tabBarKey={tabBarKey}>
+    <DefaultLayoutMobile showTabBar={!isSubPath} tabBarKey={tabBarKey}>
       {children}
-    </Layout>
+    </DefaultLayoutMobile>
   );
 });
 

package/src/layout/{GlobalLayout → routes}/index.tsx

@@ -3,6 +3,6 @@ import ServerLayout from '@/components/server/ServerLayout';
 import Desktop from './Desktop';
 import Mobile from './Mobile';
 
-const GlobalLayout = ServerLayout({ Desktop, Mobile });
+const LayoutRoutes = ServerLayout({ Desktop, Mobile });
 
-export default GlobalLayout;
+export default LayoutRoutes;

package/src/{app/api/auth/next-auth.ts → libs/next-auth/index.ts}

@@ -32,7 +32,7 @@ const nextAuth = NextAuth({
     async session({ session, token }) {
       // Pick userid from token
       if (session.user) {
-        session.user.id = token.userId ?? session.user.id;
+        session.user.id = (token.userId ?? session.user.id) as string;
       }
       return session;
     },

package/src/middleware.ts

@@ -1,8 +1,8 @@
 import { NextResponse } from 'next/server';
 
 import { getServerConfig } from '@/config/server';
+import { auth } from '@/libs/next-auth';
 
-import { auth } from './app/api/auth/next-auth';
 import { OAUTH_AUTHORIZED } from './const/auth';
 
 export const config = {

package/src/services/config.ts

@@ -33,7 +33,7 @@ class ConfigService {
     return await sessionService.batchCreateSessions(sessions);
   };
   importMessages = async (messages: ChatMessage[]) => {
-    return messageService.batchCreate(messages);
+    return messageService.batchCreateMessages(messages);
   };
   importSettings = async (settings: GlobalSettings) => {
     useGlobalStore.getState().importAppSettings(settings);
@@ -105,7 +105,7 @@ class ConfigService {
    * export all agents
    */
   exportAgents = async () => {
-    const agents = await sessionService.getAllAgents();
+    const agents = await sessionService.getSessionsByType('agent');
     const sessionGroups = await sessionService.getSessionGroups();
 
     const config = createConfigFile('agents', { sessionGroups, sessions: agents });
@@ -117,7 +117,7 @@ class ConfigService {
    * export all sessions
    */
   exportSessions = async () => {
-    const sessions = await sessionService.getSessions();
+    const sessions = await sessionService.getSessionsByType();
     const sessionGroups = await sessionService.getSessionGroups();
     const messages = await messageService.getAllMessages();
     const topics = await topicService.getAllTopics();
@@ -188,7 +188,7 @@ class ConfigService {
    * export all data
    */
   exportAll = async () => {
-    const sessions = await sessionService.getSessions();
+    const sessions = await sessionService.getSessionsByType();
     const sessionGroups = await sessionService.getSessionGroups();
     const messages = await messageService.getAllMessages();
     const topics = await topicService.getAllTopics();

package/src/services/file/client.test.ts

@@ -3,9 +3,9 @@ import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import { FileModel } from '@/database/client/models/file';
 import { DB_File } from '@/database/client/schemas/files';
 
-import { FileService } from './client';
+import { ClientService } from './client';
 
-const fileService = new FileService();
+const fileService = new ClientService();
 
 // Mocks for the FileModel
 vi.mock('@/database/client/models/file', () => ({

package/src/services/file/client.ts

@@ -4,12 +4,9 @@ import { FilePreview } from '@/types/files';
 import compressImage from '@/utils/compressImage';
 
 import { API_ENDPOINTS } from '../_url';
+import { IFileService } from './type';
 
-export class FileService {
-  private isImage(fileType: string) {
-    const imageRegex = /^image\//;
-    return imageRegex.test(fileType);
-  }
+export class ClientService implements IFileService {
   async uploadFile(file: DB_File) {
     // 跳过图片上传测试
     const isTestData = file.size === 1;
@@ -22,26 +19,6 @@ export class FileService {
     return FileModel.create(file);
   }
 
-  async uploadImageFile(file: DB_File) {
-    // 加载图片
-    const url = file.url || URL.createObjectURL(new Blob([file.data]));
-
-    const img = new Image();
-    img.src = url;
-    await (() =>
-      new Promise((resolve) => {
-        img.addEventListener('load', resolve);
-      }))();
-
-    // 压缩图片
-    const base64String = compressImage({ img, type: file.fileType });
-    const binaryString = atob(base64String.split('base64,')[1]);
-    const uint8Array = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
-    file.data = uint8Array.buffer;
-
-    return FileModel.create(file);
-  }
-
   async uploadImageByUrl(url: string, file: Pick<DB_File, 'name' | 'metadata'>) {
     const res = await fetch(API_ENDPOINTS.proxy, { body: url, method: 'POST' });
     const data = await res.arrayBuffer();
@@ -57,14 +34,6 @@ export class FileService {
     });
   }
 
-  async removeFile(id: string) {
-    return FileModel.delete(id);
-  }
-
-  async removeAllFiles() {
-    return FileModel.clear();
-  }
-
   async getFile(id: string): Promise<FilePreview> {
     const item = await FileModel.findById(id);
     if (!item) {
@@ -83,4 +52,37 @@ export class FileService {
       url,
     };
   }
+
+  async removeFile(id: string) {
+    return FileModel.delete(id);
+  }
+
+  async removeAllFiles() {
+    return FileModel.clear();
+  }
+
+  private isImage(fileType: string) {
+    const imageRegex = /^image\//;
+    return imageRegex.test(fileType);
+  }
+
+  private async uploadImageFile(file: DB_File) {
+    // 加载图片
+    const url = file.url || URL.createObjectURL(new Blob([file.data]));
+
+    const img = new Image();
+    img.src = url;
+    await (() =>
+      new Promise((resolve) => {
+        img.addEventListener('load', resolve);
+      }))();
+
+    // 压缩图片
+    const base64String = compressImage({ img, type: file.fileType });
+    const binaryString = atob(base64String.split('base64,')[1]);
+    const uint8Array = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
+    file.data = uint8Array.buffer;
+
+    return FileModel.create(file);
+  }
 }

package/src/services/file/index.ts

@@ -1,3 +1,9 @@
-import { FileService } from './client';
+// import { getClientConfig } from '@/config/client';
+import { ClientService } from './client';
 
-export const fileService = new FileService();
+// import { ServerService } from './server';
+//
+// const { ENABLED_SERVER_SERVICE } = getClientConfig();
+//
+// export const fileService = ENABLED_SERVER_SERVICE ? new ServerService() : new ClientService();
+export const fileService = new ClientService();

package/src/services/file/type.ts

@@ -0,0 +1,11 @@
+/* eslint-disable typescript-sort-keys/interface */
+import { DB_File } from '@/database/client/schemas/files';
+import { FilePreview } from '@/types/files';
+
+export interface IFileService {
+  uploadFile(file: DB_File): Promise<any>;
+  uploadImageByUrl(url: string, file: Pick<DB_File, 'name' | 'metadata'>): Promise<any>;
+  removeFile(id: string): Promise<any>;
+  removeAllFiles(): Promise<any>;
+  getFile(id: string): Promise<FilePreview>;
+}

package/src/services/message/client.test.ts

@@ -3,9 +3,9 @@ import { Mock, describe, expect, it, vi } from 'vitest';
 import { CreateMessageParams, MessageModel } from '@/database/client/models/message';
 import { ChatMessage, ChatMessageError, ChatPluginPayload } from '@/types/message';
 
-import { MessageService } from './client';
+import { ClientService } from './client';
 
-const messageService = new MessageService();
+const messageService = new ClientService();
 
 // Mock the MessageModel
 vi.mock('@/database/client/models/message', () => {
@@ -27,7 +27,7 @@ vi.mock('@/database/client/models/message', () => {
   };
 });
 
-describe('MessageService', () => {
+describe('MessageClientService', () => {
   // Mock data
   const mockMessageId = 'mock-message-id';
   const mockMessage = {
@@ -57,7 +57,7 @@ describe('MessageService', () => {
       (MessageModel.create as Mock).mockResolvedValue({ id: mockMessageId });
 
       // Execute
-      const messageId = await messageService.create(createParams);
+      const messageId = await messageService.createMessage(createParams);
 
       // Assert
       expect(MessageModel.create).toHaveBeenCalledWith(createParams);
@@ -71,7 +71,7 @@ describe('MessageService', () => {
       (MessageModel.batchCreate as Mock).mockResolvedValue(mockMessages);
 
       // Execute
-      const result = await messageService.batchCreate(mockMessages);
+      const result = await messageService.batchCreateMessages(mockMessages);
 
       // Assert
       expect(MessageModel.batchCreate).toHaveBeenCalledWith(mockMessages);
@@ -79,32 +79,6 @@ describe('MessageService', () => {
     });
   });
 
-  describe('hasMessages', () => {
-    it('should return true if there are messages', async () => {
-      // Setup
-      (MessageModel.count as Mock).mockResolvedValue(1);
-
-      // Execute
-      const hasMessages = await messageService.hasMessages();
-
-      // Assert
-      expect(MessageModel.count).toHaveBeenCalled();
-      expect(hasMessages).toBe(true);
-    });
-
-    it('should return false if there are no messages', async () => {
-      // Setup
-      (MessageModel.count as Mock).mockResolvedValue(0);
-
-      // Execute
-      const hasMessages = await messageService.hasMessages();
-
-      // Assert
-      expect(MessageModel.count).toHaveBeenCalled();
-      expect(hasMessages).toBe(false);
-    });
-  });
-
   describe('removeMessage', () => {
     it('should remove a message by id', async () => {
       // Setup
@@ -172,7 +146,7 @@ describe('MessageService', () => {
       (MessageModel.clearTable as Mock).mockResolvedValue(true);
 
       // Execute
-      const result = await messageService.clearAllMessage();
+      const result = await messageService.removeAllMessages();
 
       // Assert
       expect(MessageModel.clearTable).toHaveBeenCalled();

package/src/services/message/client.ts

@@ -2,42 +2,29 @@ import { MessageModel } from '@/database/client/models/message';
 import { DB_Message } from '@/database/client/schemas/message';
 import { ChatMessage, ChatMessageError, ChatPluginPayload } from '@/types/message';
 
-export interface CreateMessageParams
-  extends Partial<Omit<ChatMessage, 'content' | 'role'>>,
-    Pick<ChatMessage, 'content' | 'role'> {
-  fromModel?: string;
-  fromProvider?: string;
-  sessionId: string;
-  traceId?: string;
-}
+import { CreateMessageParams, IMessageService } from './type';
 
-export class MessageService {
-  async create(data: CreateMessageParams) {
+export class ClientService implements IMessageService {
+  async createMessage(data: CreateMessageParams) {
     const { id } = await MessageModel.create(data);
 
     return id;
   }
 
-  async batchCreate(messages: ChatMessage[]) {
+  async batchCreateMessages(messages: ChatMessage[]) {
     return MessageModel.batchCreate(messages);
   }
 
-  async hasMessages() {
-    const number = await MessageModel.count();
-    return number > 0;
-  }
-
-  async messageCountToCheckTrace() {
-    const number = await MessageModel.count();
-    return number >= 4;
-  }
-
   async getMessages(sessionId: string, topicId?: string): Promise<ChatMessage[]> {
     return MessageModel.query({ sessionId, topicId });
   }
 
-  async removeMessage(id: string) {
-    return MessageModel.delete(id);
+  async getAllMessages() {
+    return MessageModel.queryAll();
+  }
+
+  async countMessages() {
+    return MessageModel.count();
   }
 
   async getAllMessagesInSession(sessionId: string) {
@@ -48,18 +35,6 @@ export class MessageService {
     return MessageModel.update(id, { error });
   }
 
-  async removeMessages(assistantId: string, topicId?: string) {
-    return MessageModel.batchDelete(assistantId, topicId);
-  }
-
-  async clearAllMessage() {
-    return MessageModel.clearTable();
-  }
-
-  async bindMessagesToTopic(topicId: string, messageIds: string[]) {
-    return MessageModel.batchUpdate(messageIds, { topicId });
-  }
-
   async updateMessage(id: string, message: Partial<DB_Message>) {
     return MessageModel.update(id, message);
   }
@@ -72,7 +47,19 @@ export class MessageService {
     return MessageModel.updatePluginState(id, key, value);
   }
 
-  async getAllMessages() {
-    return MessageModel.queryAll();
+  async bindMessagesToTopic(topicId: string, messageIds: string[]) {
+    return MessageModel.batchUpdate(messageIds, { topicId });
+  }
+
+  async removeMessage(id: string) {
+    return MessageModel.delete(id);
+  }
+
+  async removeMessages(assistantId: string, topicId?: string) {
+    return MessageModel.batchDelete(assistantId, topicId);
+  }
+
+  async removeAllMessages() {
+    return MessageModel.clearTable();
   }
 }

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

@@ -0,0 +1,48 @@
+import { Mock, describe, expect, it, vi } from 'vitest';
+
+import { CreateMessageParams, MessageModel } from '@/database/client/models/message';
+import { ChatMessage, ChatMessageError, ChatPluginPayload } from '@/types/message';
+
+import { messageService } from './index';
+
+// Mock the MessageModel
+vi.mock('@/database/client/models/message', () => {
+  return {
+    MessageModel: {
+      count: vi.fn(),
+    },
+  };
+});
+
+describe('MessageService', () => {
+  beforeEach(() => {
+    // Reset all mocks before running each test case
+    vi.resetAllMocks();
+  });
+
+  describe('hasMessages', () => {
+    it('should return true if there are messages', async () => {
+      // Setup
+      (MessageModel.count as Mock).mockResolvedValue(1);
+
+      // Execute
+      const hasMessages = await messageService.hasMessages();
+
+      // Assert
+      expect(MessageModel.count).toHaveBeenCalled();
+      expect(hasMessages).toBe(true);
+    });
+
+    it('should return false if there are no messages', async () => {
+      // Setup
+      (MessageModel.count as Mock).mockResolvedValue(0);
+
+      // Execute
+      const hasMessages = await messageService.hasMessages();
+
+      // Assert
+      expect(MessageModel.count).toHaveBeenCalled();
+      expect(hasMessages).toBe(false);
+    });
+  });
+});

package/src/services/message/index.ts

@@ -1,4 +1,24 @@
-import { MessageService } from './client';
+// import { getClientConfig } from '@/config/client';
+// import { ServerService } from './server';
+// import { ClientService } from './client';
+//
+// const { ENABLED_SERVER_SERVICE } = getClientConfig();
+//
+// export const messageService = ENABLED_SERVER_SERVICE ? new ServerService() : new ClientService();
+import { ClientService } from './client';
+
+export type { CreateMessageParams } from './type';
+
+class MessageService extends ClientService {
+  async hasMessages() {
+    const number = await this.countMessages();
+    return number > 0;
+  }
+
+  async messageCountToCheckTrace() {
+    const number = await this.countMessages();
+    return number >= 4;
+  }
+}
 
 export const messageService = new MessageService();
-export type { CreateMessageParams } from './client';

package/src/services/message/type.ts

@@ -0,0 +1,33 @@
+import { DB_Message } from '@/database/client/schemas/message';
+import { ChatMessage, ChatMessageError, ChatPluginPayload } from '@/types/message';
+
+/* eslint-disable typescript-sort-keys/interface */
+
+export interface CreateMessageParams
+  extends Partial<Omit<ChatMessage, 'content' | 'role'>>,
+    Pick<ChatMessage, 'content' | 'role'> {
+  fromModel?: string;
+  fromProvider?: string;
+  sessionId: string;
+  traceId?: string;
+}
+
+export interface IMessageService {
+  createMessage(data: CreateMessageParams): Promise<string>;
+  batchCreateMessages(messages: ChatMessage[]): Promise<any>;
+
+  getMessages(sessionId: string, topicId?: string): Promise<ChatMessage[]>;
+  getAllMessages(): Promise<ChatMessage[]>;
+  getAllMessagesInSession(sessionId: string): Promise<ChatMessage[]>;
+  countMessages(): Promise<number>;
+
+  updateMessageError(id: string, error: ChatMessageError): Promise<any>;
+  updateMessage(id: string, message: Partial<DB_Message>): Promise<any>;
+  updateMessagePlugin(id: string, plugin: ChatPluginPayload): Promise<any>;
+  updateMessagePluginState(id: string, key: string, value: any): Promise<any>;
+  bindMessagesToTopic(topicId: string, messageIds: string[]): Promise<any>;
+
+  removeMessage(id: string): Promise<any>;
+  removeMessages(assistantId: string, topicId?: string): Promise<any>;
+  removeAllMessages(): Promise<any>;
+}

package/src/services/plugin/client.test.ts

@@ -6,9 +6,9 @@ import { DB_Plugin } from '@/database/client/schemas/plugin';
 import { LobeTool } from '@/types/tool';
 import { LobeToolCustomPlugin } from '@/types/tool/plugin';
 
-import { InstallPluginParams, PluginService } from './client';
+import { ClientService, InstallPluginParams } from './client';
 
-const pluginService = new PluginService();
+const pluginService = new ClientService();
 
 // Mocking modules and functions
 

package/src/services/plugin/client.ts

@@ -10,7 +10,7 @@ export interface InstallPluginParams {
   type: 'plugin' | 'customPlugin';
 }
 
-export class PluginService {
+export class ClientService {
   installPlugin = async (plugin: InstallPluginParams) => {
     return PluginModel.create(plugin);
   };

package/src/services/plugin/index.ts

@@ -1,5 +1,11 @@
-import { PluginService } from './client';
+// import { getClientConfig } from '@/config/client';
+import { ClientService } from './client';
 
-export type { InstallPluginParams } from './client';
+// import { ServerService } from './server';
+//
+// export type { InstallPluginParams } from './client';
+//
+// const { ENABLED_SERVER_SERVICE } = getClientConfig();
 
-export const pluginService = new PluginService();
+// export const pluginService = ENABLED_SERVER_SERVICE ? new ServerService() : new ClientService();
+export const pluginService = new ClientService();