@lobehub/lobehub 2.0.0-next.29 → 2.0.0-next.30

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+## [Version 2.0.0-next.30](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.29...v2.0.0-next.30)
+
+<sup>Released on **2025-11-05**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Enhance message router with service layer and comprehensive tests.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Enhance message router with service layer and comprehensive tests, closes [#10056](https://github.com/lobehub/lobe-chat/issues/10056) ([62110e0](https://github.com/lobehub/lobe-chat/commit/62110e0))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.29](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.28...v2.0.0-next.29)
 
 <sup>Released on **2025-11-04**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Enhance message router with service layer and comprehensive tests."
+      ]
+    },
+    "date": "2025-11-05",
+    "version": "2.0.0-next.30"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.29",
+  "version": "2.0.0-next.30",
   "description": "LobeHub - an open-source,comprehensive AI Agent framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

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

@@ -932,135 +932,6 @@ describe('MessageModel', () => {
     });
   });
 
-  describe('createNewMessage', () => {
-    it('should create message and return id with messages list', async () => {
-      // Call createNewMessage method
-      const result = await messageModel.createNewMessage({
-        role: 'user',
-        content: 'test message',
-        sessionId: '1',
-      });
-
-      // Assert return structure
-      expect(result).toHaveProperty('id');
-      expect(result).toHaveProperty('messages');
-      expect(result.id).toBeDefined();
-      expect(result.messages).toBeInstanceOf(Array);
-    });
-
-    it('should return newly created message in messages list', async () => {
-      const content = 'new test message ' + Date.now();
-
-      const result = await messageModel.createNewMessage({
-        role: 'user',
-        content,
-        sessionId: '1',
-      });
-
-      // Verify newly created message is in the list
-      const createdMessage = result.messages.find((m) => m.id === result.id);
-      expect(createdMessage).toBeDefined();
-      expect(createdMessage?.content).toBe(content);
-      expect(createdMessage?.role).toBe('user');
-    });
-
-    it('should return all messages for the session', async () => {
-      // Create multiple messages
-      await messageModel.create({ role: 'user', content: 'message 1', sessionId: '1' });
-      await messageModel.create({ role: 'assistant', content: 'message 2', sessionId: '1' });
-
-      // Create third message and get complete list
-      const result = await messageModel.createNewMessage({
-        role: 'user',
-        content: 'message 3',
-        sessionId: '1',
-      });
-
-      // Verify all messages are returned
-      expect(result.messages.length).toBeGreaterThanOrEqual(3);
-    });
-
-    it('should apply groupAssistantMessages transformation', async () => {
-      // Create an assistant message with tools
-      const assistantMsg = await messageModel.create({
-        role: 'assistant',
-        content: 'Checking weather',
-        tools: [
-          {
-            id: 'tool-1',
-            identifier: 'weather',
-            apiName: 'getWeather',
-            arguments: '{"city":"Beijing"}',
-            type: 'default',
-          },
-        ],
-        sessionId: '1',
-      });
-
-      // Create corresponding tool message
-      const toolMsg = await messageModel.create({
-        role: 'tool',
-        content: 'Beijing: Sunny, 25°C',
-        tool_call_id: 'tool-1',
-        sessionId: '1',
-        plugin: {
-          identifier: 'weather',
-          apiName: 'getWeather',
-          arguments: '{"city":"Beijing"}',
-          type: 'default',
-        },
-      });
-
-      // Create new message and get list
-      const result = await messageModel.createNewMessage({
-        role: 'user',
-        content: 'Thanks!',
-        sessionId: '1',
-      });
-
-      // Verify assistant message is grouped
-      const groupMessage = result.messages.find((m) => m.id === assistantMsg.id);
-      expect(groupMessage?.role).toBe('group');
-      expect(groupMessage?.children).toBeDefined();
-      expect(groupMessage?.children).toHaveLength(1);
-
-      // Verify tool results are merged into children
-      const childBlock = groupMessage?.children?.[0];
-      expect(childBlock?.tools).toBeDefined();
-      expect(childBlock?.tools).toHaveLength(1);
-
-      // Verify tool contains execution result
-      const tool = childBlock?.tools?.[0];
-      expect(tool?.id).toBe('tool-1');
-      expect(tool?.identifier).toBe('weather');
-      expect(tool?.result).toBeDefined();
-      expect(tool?.result?.content).toBe('Beijing: Sunny, 25°C');
-    });
-
-    it('should filter messages by topicId if provided', async () => {
-      const topicId = 'topic-1';
-      await serverDB.insert(topics).values({ id: topicId, sessionId: '1', userId });
-
-      // Create messages with different topics
-      await messageModel.create({ role: 'user', content: 'topic 1 msg', sessionId: '1', topicId });
-      await messageModel.create({ role: 'user', content: 'no topic msg', sessionId: '1' });
-
-      // Create new message and specify topicId
-      const result = await messageModel.createNewMessage({
-        role: 'user',
-        content: 'new topic msg',
-        sessionId: '1',
-        topicId,
-      });
-
-      // Verify only messages from that topic are returned
-      expect(result.messages.every((m) => m.topicId === topicId || m.topicId === undefined)).toBe(
-        true,
-      );
-      expect(result.messages.find((m) => m.content === 'no topic msg')).toBeUndefined();
-    });
-  });
-
   describe('updateMessage', () => {
     it('should update message content', async () => {
       // Create test data

package/packages/database/src/models/message.ts

@@ -7,7 +7,6 @@ import {
   ChatTranslate,
   ChatVideoItem,
   CreateMessageParams,
-  CreateMessageResult,
   DBMessageItem,
   ModelRankItem,
   NewMessageQueryParams,
@@ -532,54 +531,6 @@ export class MessageModel {
     });
   };
 
-  /**
-   * Create a new message and return the complete message list
-   *
-   * This method combines message creation and querying into a single operation,
-   * reducing the need for separate refresh calls and improving performance.
-   *
-   * @param params - Message creation parameters
-   * @param options - Query options for post-processing
-   * @returns Object containing the created message ID and full message list
-   *
-   * @example
-   * const { id, messages } = await messageModel.createNewMessage({
-   *   role: 'assistant',
-   *   content: 'Hello',
-   *   tools: [...],
-   *   sessionId: 'session-1',
-   * });
-   * // messages already contains grouped structure, no need to refresh
-   */
-  createNewMessage = async (
-    params: CreateMessageParams,
-    options: {
-      postProcessUrl?: (path: string | null, file: { fileType: string }) => Promise<string>;
-    } = {},
-  ): Promise<CreateMessageResult> => {
-    // 1. Create the message (reuse existing create method)
-    const item = await this.create(params);
-
-    // 2. Query all messages for this session/topic
-    // query() method internally applies groupAssistantMessages transformation
-    const messages = await this.query(
-      {
-        current: 0,
-        groupId: params.groupId,
-        pageSize: 9999,
-        sessionId: params.sessionId,
-        topicId: params.topicId, // Get all messages
-      },
-      { ...options, groupAssistantMessages: true },
-    );
-
-    // 3. Return the result
-    return {
-      id: item.id,
-      messages,
-    };
-  };
-
   batchCreate = async (newMessages: DBMessageItem[]) => {
     const messagesToInsert = newMessages.map((m) => {
       // TODO: need a better way to handle this

package/packages/utils/src/server/auth.ts

@@ -29,9 +29,9 @@ export const getUserAuth = async () => {
 };
 
 /**
- * 从授权头中提取 Bearer Token
- * @param authHeader - 授权头 (例如 "Bearer xxx")
- * @returns Bearer Token 或 null（如果授权头无效或不存在）
+ * Extract Bearer Token from authorization header
+ * @param authHeader - Authorization header (e.g. "Bearer xxx")
+ * @returns Bearer Token or null (if authorization header is invalid or does not exist)
  */
 export const extractBearerToken = (authHeader?: string | null): string | null => {
   if (!authHeader) return null;
@@ -51,9 +51,9 @@ export const extractBearerToken = (authHeader?: string | null): string | null =>
 };
 
 /**
- * 从 Oidc-Auth header 中提取 JWT token
- * @param authHeader - Oidc-Auth header 值 (例如 "Oidc-Auth xxx")
- * @returns JWT token 或 null（如果授权头无效或不存在）
+ * Extract JWT token from Oidc-Auth header
+ * @param authHeader - Oidc-Auth header value (e.g. "Oidc-Auth xxx")
+ * @returns JWT token or null (if authorization header is invalid or does not exist)
  */
 export const extractOidcAuthToken = (authHeader?: string | null): string | null => {
   if (!authHeader) return null;

package/packages/utils/src/server/geo.ts

@@ -13,19 +13,19 @@ const getLocalTime = (timeZone: string) => {
 const isValidTimeZone = (timeZone: string) => {
   try {
     getLocalTime(timeZone);
-    return true; // 如果没抛异常，说明时区有效
+    return true; // If no exception is thrown, the timezone is valid
   } catch (e) {
-    // 捕获到 RangeError，说明时区无效
+    // If a RangeError is caught, the timezone is invalid
     if (e instanceof RangeError) {
       return false;
     }
-    // 如果是其他错误，最好重新抛出
+    // If it's another error, better to re-throw it
     throw e;
   }
 };
 
 export const parseDefaultThemeFromCountry = (request: NextRequest) => {
-  // 1. 从请求头中获取国家代码
+  // 1. Get country code from request headers
   const geo = geolocation(request);
 
   const countryCode =
@@ -35,22 +35,22 @@ export const parseDefaultThemeFromCountry = (request: NextRequest) => {
     request.headers.get('x-zeabur-ip-country') || // Zeabur
     request.headers.get('x-country-code'); // Netlify
 
-  // 如果没有获取到国家代码，直接返回 light 主题
+  // If no country code is obtained, return light theme directly
   if (!countryCode) return 'light';
 
-  // 2. 获取国家的时区信息
+  // 2. Get timezone information for the country
   const country = getCountry(countryCode);
 
-  // 如果找不到国家信息或该国家没有时区信息，返回 light 主题
+  // If country information is not found or the country has no timezone information, return light theme
   if (!country?.timezones?.length) return 'light';
 
   const timeZone = country.timezones.find((tz) => isValidTimeZone(tz));
   if (!timeZone) return 'light';
 
-  // 3. 获取该国家的第一个 时区下的当前时间
+  // 3. Get the current time in the country's first timezone
   const localTime = getLocalTime(timeZone);
 
-  // 4. 解析小时数并确定主题
+  // 4. Parse the hour and determine the theme
   const localHour = parseInt(localTime);
   // console.log(
   //   `[theme] Country: ${countryCode}, Timezone: ${country.timezones[0]}, LocalHour: ${localHour}`,

package/packages/utils/src/server/xor.ts

@@ -3,15 +3,15 @@ import { ClientSecretPayload } from '@lobechat/types';
 import { SECRET_XOR_KEY } from '@/const/auth';
 
 /**
- * 将 Base64 字符串转换为 Uint8Array
+ * Convert Base64 string to Uint8Array
  */
 const base64ToUint8Array = (base64: string): Uint8Array => {
-  // Node.js 环境下直接使用 Buffer
+  // Use Buffer directly in Node.js environment
   return Buffer.from(base64, 'base64');
 };
 
 /**
- * 对 Uint8Array 进行 XOR 运算 (与客户端的 xorProcess 函数相同)
+ * Perform XOR operation on Uint8Array (same as the client-side xorProcess function)
  */
 const xorProcess = (data: Uint8Array, key: Uint8Array): Uint8Array => {
   const result = new Uint8Array(data.length);
@@ -22,7 +22,7 @@ const xorProcess = (data: Uint8Array, key: Uint8Array): Uint8Array => {
 };
 
 /**
- * 将 Uint8Array 转换为字符串 (UTF-8 解码)
+ * Convert Uint8Array to string (UTF-8 decoding)
  */
 const uint8ArrayToString = (arr: Uint8Array): string => {
   return new TextDecoder().decode(arr);
@@ -31,13 +31,13 @@ const uint8ArrayToString = (arr: Uint8Array): string => {
 export const getXorPayload = (token: string): ClientSecretPayload => {
   const keyBytes = new TextEncoder().encode(SECRET_XOR_KEY);
 
-  // 1. Base64 解码
+  // 1. Base64 decoding
   const base64DecodedBytes = base64ToUint8Array(token);
 
-  // 2. XOR 解混淆
+  // 2. XOR deobfuscation
   const xorDecryptedBytes = xorProcess(base64DecodedBytes, keyBytes);
 
-  // 3. 转换为字符串并解析 JSON
+  // 3. Convert to string and parse JSON
   const decodedJsonString = uint8ArrayToString(xorDecryptedBytes);
 
   return JSON.parse(decodedJsonString) as ClientSecretPayload;