@lobehub/chat 1.6.7 → 1.6.8

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.6.8](https://github.com/lobehub/lobe-chat/compare/v1.6.7...v1.6.8)
+
+<sup>Released on **2024-07-23**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Move server modules.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Move server modules, closes [#3291](https://github.com/lobehub/lobe-chat/issues/3291) ([c7c9f39](https://github.com/lobehub/lobe-chat/commit/c7c9f39))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.6.7](https://github.com/lobehub/lobe-chat/compare/v1.6.6...v1.6.7)
 
 <sup>Released on **2024-07-23**</sup>

package/README.md

@@ -273,7 +273,7 @@ Our marketplace is not just a showcase platform but also a collaborative space.
 | [Convert SQL Table Structure to Dao and Mapper](https://chat-preview.lobehub.com/market?agent=my-batis-generator)<br/><sup>By **[MeYoung](https://github.com/MeYoung)** on **2024-07-17**</sup> | Generate entity class and MyBatis Mapper based on a table structure<br/>`sql` `sql` `mybatis`                                                                                                                                                                                                                                 |
 | [Auto Extraction Data](https://chat-preview.lobehub.com/market?agent=the-20-autoextract)<br/><sup>By **[vkhoilq](https://github.com/vkhoilq)** on **2024-07-17**</sup>                          | The20 Auto Extraction Data<br/>`the-20` `autoextract`                                                                                                                                                                                                                                                                         |
 
-> 📊 Total agents: [<kbd>**301**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
+> 📊 Total agents: [<kbd>**302**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
 
  <!-- AGENT LIST -->
 

package/README.zh-CN.md

@@ -261,7 +261,7 @@ LobeChat 的插件生态系统是其核心功能的重要扩展，它极大地
 | [SQL 表结构转 Dao 和 Mapper](https://chat-preview.lobehub.com/market?agent=my-batis-generator)<br/><sup>By **[MeYoung](https://github.com/MeYoung)** on **2024-07-17**</sup> | 给与一个表结构，生成表的实体和 MyBatis 的 Mapper<br/>`sql` `sql` `mybatis`                                                                                                                    |
 | [自动提取数据](https://chat-preview.lobehub.com/market?agent=the-20-autoextract)<br/><sup>By **[vkhoilq](https://github.com/vkhoilq)** on **2024-07-17**</sup>               | The20 自动提取数据<br/>`the-20` `autoextract`                                                                                                                                                 |
 
-> 📊 Total agents: [<kbd>**301**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
+> 📊 Total agents: [<kbd>**302**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
 
  <!-- AGENT LIST -->
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "Lobe Chat - an open-source, high-performance chatbot 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/src/database/server/models/__tests__/user.test.ts

@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
-import { KeyVaultsGateKeeper } from '@/server/keyVaultsEncrypt';
+import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserPreference } from '@/types/user';
 import { UserSettings } from '@/types/user/settings';
 

package/src/database/server/models/user.ts

@@ -3,7 +3,7 @@ import { eq } from 'drizzle-orm';
 import { DeepPartial } from 'utility-types';
 
 import { serverDB } from '@/database/server/core/db';
-import { KeyVaultsGateKeeper } from '@/server/keyVaultsEncrypt';
+import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserPreference } from '@/types/user';
 import { UserSettings } from '@/types/user/settings';
 import { merge } from '@/utils/merge';

package/src/server/routers/edge/upload.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
 import { passwordProcedure, router } from '@/libs/trpc';
-import { S3 } from '@/server/files/s3';
+import { S3 } from '@/server/modules/S3';
 
 export const uploadRouter = router({
   createS3PreSignedUrl: passwordProcedure

package/src/server/routers/lambda/importer.ts

@@ -2,12 +2,21 @@ import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
 import { authedProcedure, router } from '@/libs/trpc';
-import { S3 } from '@/server/files/s3';
-import { DataImporter } from '@/server/modules/DataImporter';
+import { S3 } from '@/server/modules/S3';
+import { DataImporterService } from '@/server/services/dataImporter';
 import { ImportResults, ImporterEntryData } from '@/types/importer';
 
+const importProcedure = authedProcedure.use(async (opts) => {
+  const { ctx } = opts;
+  const dataImporterService = new DataImporterService(ctx.userId);
+
+  return opts.next({
+    ctx: { dataImporterService },
+  });
+});
+
 export const importerRouter = router({
-  importByFile: authedProcedure
+  importByFile: importProcedure
     .input(z.object({ pathname: z.string() }))
     .mutation(async ({ input, ctx }): Promise<ImportResults> => {
       let data: ImporterEntryData | undefined;
@@ -27,12 +36,10 @@ export const importerRouter = router({
         });
       }
 
-      const dataImporter = new DataImporter(ctx.userId);
-
-      return dataImporter.importData(data);
+      return ctx.dataImporterService.importData(data);
     }),
 
-  importByPost: authedProcedure
+  importByPost: importProcedure
     .input(
       z.object({
         data: z.object({
@@ -45,8 +52,6 @@ export const importerRouter = router({
       }),
     )
     .mutation(async ({ input, ctx }): Promise<ImportResults> => {
-      const dataImporter = new DataImporter(ctx.userId);
-
-      return dataImporter.importData(input.data);
+      return ctx.dataImporterService.importData(input.data);
     }),
 });

package/src/server/{modules/DataImporter → services/dataImporter}/__tests__/index.test.ts

@@ -16,7 +16,7 @@ import { CURRENT_CONFIG_VERSION } from '@/migrations';
 import { ImportResult } from '@/services/config';
 import { ImporterEntryData } from '@/types/importer';
 
-import { DataImporter } from '../index';
+import { DataImporterService } from '../index';
 import mockImportData from './fixtures/messages.json';
 
 let serverDB = await getTestDBInstance();
@@ -28,7 +28,7 @@ vi.mock('@/database/server/core/db', async () => ({
 }));
 
 const userId = 'test-user-id';
-let importer: DataImporter;
+let importer: DataImporterService;
 
 beforeEach(async () => {
   await serverDB.delete(users);
@@ -38,7 +38,7 @@ beforeEach(async () => {
     await tx.insert(users).values({ id: userId });
   });
 
-  importer = new DataImporter(userId);
+  importer = new DataImporterService(userId);
 });
 
 describe('DataImporter', () => {

package/src/server/{modules/DataImporter → services/dataImporter}/index.ts

@@ -15,7 +15,7 @@ import {
 import { ImportResult } from '@/services/config';
 import { ImporterEntryData } from '@/types/importer';
 
-export class DataImporter {
+export class DataImporterService {
   private userId: string;
 
   /**

package/vitest.config.ts

@@ -30,7 +30,7 @@ export default defineConfig({
       '**/dist/**',
       '**/build/**',
       'src/database/server/**/**',
-      'src/server/modules/**/**',
+      'src/server/services/**/**',
     ],
     globals: true,
     server: {