@lobehub/chat 1.6.7 → 1.6.9

package/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 # Changelog
 
+### [Version 1.6.9](https://github.com/lobehub/lobe-chat/compare/v1.6.8...v1.6.9)
+
+<sup>Released on **2024-07-23**</sup>
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [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/Dockerfile

@@ -1,138 +1,141 @@
-FROM node:20-slim AS base
+## Base image for all the stages
+FROM node:20-alpine AS base
 
-## Sharp dependencies, copy all the files for production
-FROM base AS sharp
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
+RUN \
+    # Add user nextjs to run the app
+    addgroup --system --gid 1001 nodejs \
+    && adduser --system --uid 1001 nextjs
 
-WORKDIR /app
-
-RUN pnpm add sharp
-
-## Install dependencies only when needed
+## Builder image, install all the dependencies and build the app
 FROM base AS builder
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-
-WORKDIR /app
 
-COPY package.json ./
-COPY .npmrc ./
-
-# If you want to build docker in China
-# RUN npm config set registry https://registry.npmmirror.com/
-RUN pnpm i
-
-COPY . .
+ARG USE_NPM_CN_MIRROR
 
-ENV NEXT_PUBLIC_BASE_PATH ""
+ENV NEXT_PUBLIC_BASE_PATH=""
 
 # Sentry
-ENV NEXT_PUBLIC_SENTRY_DSN ""
-ENV SENTRY_ORG ""
-ENV SENTRY_PROJECT ""
+ENV NEXT_PUBLIC_SENTRY_DSN="" \
+    SENTRY_ORG="" \
+    SENTRY_PROJECT=""
 
 # Posthog
-ENV NEXT_PUBLIC_ANALYTICS_POSTHOG ""
-ENV NEXT_PUBLIC_POSTHOG_KEY ""
-ENV NEXT_PUBLIC_POSTHOG_HOST ""
+ENV NEXT_PUBLIC_ANALYTICS_POSTHOG="" \
+    NEXT_PUBLIC_POSTHOG_HOST="" \
+    NEXT_PUBLIC_POSTHOG_KEY=""
 
 # Umami
-ENV NEXT_PUBLIC_ANALYTICS_UMAMI ""
-ENV NEXT_PUBLIC_UMAMI_SCRIPT_URL ""
-ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID ""
+ENV NEXT_PUBLIC_ANALYTICS_UMAMI="" \
+    NEXT_PUBLIC_UMAMI_SCRIPT_URL="" \
+    NEXT_PUBLIC_UMAMI_WEBSITE_ID=""
 
 # Node
-ENV NODE_OPTIONS "--max-old-space-size=8192"
+ENV NODE_OPTIONS="--max-old-space-size=8192"
 
-# run build standalone for docker version
-RUN npm run build:docker
-
-## Production image, copy all the files and run next
-FROM base AS runner
 WORKDIR /app
 
-ENV NODE_ENV production
+COPY package.json ./
+COPY .npmrc ./
+
+RUN \
+    # If you want to build docker in China, build with --build-arg USE_NPM_CN_MIRROR=true
+    if [ "${USE_NPM_CN_MIRROR:-false}" = "true" ]; then \
+        export SENTRYCLI_CDNURL="https://npmmirror.com/mirrors/sentry-cli"; \
+        npm config set registry "https://registry.npmmirror.com/"; \
+    fi \
+    # Set the registry for corepack
+    && export COREPACK_NPM_REGISTRY=$(npm config get registry | sed 's/\/$//') \
+    # Enable corepack
+    && corepack enable \
+    # Use pnpm for corepack
+    && corepack use pnpm \
+    # Install the dependencies
+    && pnpm i \
+    # Add sharp dependencies
+    && mkdir -p /sharp \
+    && pnpm add sharp --prefix /sharp
 
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
+COPY . .
 
-COPY --from=builder /app/public ./public
+# run build standalone for docker version
+RUN npm run build:docker
 
-# Set the correct permission for prerender cache
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
+## Application image, copy all the files for production
+FROM scratch AS app
+
+COPY --from=builder /app/public /app/public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-COPY --from=sharp --chown=nextjs:nodejs /app/node_modules/.pnpm ./node_modules/.pnpm
+COPY --from=builder /app/.next/standalone /app/
+COPY --from=builder /app/.next/static /app/.next/static
+COPY --from=builder /sharp/node_modules/.pnpm /app/node_modules/.pnpm
 
-USER nextjs
+## Production image, copy all the files and run next
+FROM base
 
-EXPOSE 3210
+# Copy all the files from app, set the correct permission for prerender cache
+COPY --from=app --chown=nextjs:nodejs /app /app
+
+ENV NODE_ENV="production"
 
 # set hostname to localhost
-ENV HOSTNAME "0.0.0.0"
-ENV PORT=3210
+ENV HOSTNAME="0.0.0.0" \
+    PORT="3210"
 
 # General Variables
-ENV ACCESS_CODE ""
-
-ENV API_KEY_SELECT_MODE ""
-
-# OpenAI
-ENV OPENAI_API_KEY ""
-ENV OPENAI_PROXY_URL ""
-ENV OPENAI_MODEL_LIST ""
-
-# Azure OpenAI
-ENV USE_AZURE_OPENAI ""
-ENV AZURE_API_KEY ""
-ENV AZURE_API_VERSION ""
-
-# Google
-ENV GOOGLE_API_KEY ""
-
-# Zhipu
-ENV ZHIPU_API_KEY ""
-
-# Moonshot
-ENV MOONSHOT_API_KEY ""
+ENV ACCESS_CODE="" \
+    API_KEY_SELECT_MODE="" \
+    FEATURE_FLAGS=""
+
+# Model Variables
+ENV \
+    # Ai360
+    AI360_API_KEY="" \
+    # Anthropic
+    ANTHROPIC_API_KEY="" ANTHROPIC_PROXY_URL="" \
+    # Amazon Bedrock
+    AWS_ACCESS_KEY_ID="" AWS_SECRET_ACCESS_KEY="" AWS_REGION="" \
+    # Azure OpenAI
+    AZURE_API_KEY="" AZURE_API_VERSION="" AZURE_ENDPOINT="" AZURE_MODEL_LIST="" \
+    # Baichuan
+    BAICHUAN_API_KEY="" \
+    # DeepSeek
+    DEEPSEEK_API_KEY="" \
+    # Google
+    GOOGLE_API_KEY="" GOOGLE_PROXY_URL="" \
+    # Groq
+    GROQ_API_KEY="" GROQ_PROXY_URL="" \
+    # Minimax
+    MINIMAX_API_KEY="" \
+    # Mistral
+    MISTRAL_API_KEY="" \
+    # Moonshot
+    MOONSHOT_API_KEY="" MOONSHOT_PROXY_URL="" \
+    # Novita
+    NOVITA_API_KEY="" \
+    # Ollama
+    OLLAMA_MODEL_LIST="" OLLAMA_PROXY_URL="" \
+    # OpenAI
+    OPENAI_API_KEY="" OPENAI_MODEL_LIST="" OPENAI_PROXY_URL="" \
+    # OpenRouter
+    OPENROUTER_API_KEY="" OPENROUTER_MODEL_LIST="" \
+    # Perplexity
+    PERPLEXITY_API_KEY="" PERPLEXITY_PROXY_URL="" \
+    # Qwen
+    QWEN_API_KEY="" \
+    # Stepfun
+    STEPFUN_API_KEY="" \
+    # Taichu
+    TAICHU_API_KEY="" \
+    # TogetherAI
+    TOGETHERAI_API_KEY="" TOGETHERAI_MODEL_LIST="" \
+    # 01.AI
+    ZEROONE_API_KEY="" \
+    # Zhipu
+    ZHIPU_API_KEY=""
 
-# Ollama
-ENV OLLAMA_PROXY_URL ""
-ENV OLLAMA_MODEL_LIST ""
-
-# Perplexity
-ENV PERPLEXITY_API_KEY ""
-
-# Anthropic
-ENV ANTHROPIC_API_KEY ""
-
-# Mistral
-ENV MISTRAL_API_KEY ""
-
-# OpenRouter
-ENV OPENROUTER_API_KEY ""
-ENV OPENROUTER_MODEL_LIST ""
-
-# 01.AI
-ENV ZEROONE_API_KEY ""
-
-# TogetherAI
-ENV TOGETHERAI_API_KEY ""
-
-# Minimax
-ENV MINIMAX_API_KEY ""
-
-# DeepSeek
-ENV DEEPSEEK_API_KEY ""
+USER nextjs
 
-# Qwen
-ENV QWEN_API_KEY ""
+EXPOSE 3210/tcp
 
-CMD ["node", "server.js"]
+CMD ["node", "/app/server.js"]

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.9",
   "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",
@@ -53,6 +53,8 @@
     "prettier": "prettier -c --write \"**/**\"",
     "pull": "git pull",
     "release": "semantic-release",
+    "self-hosting:docker": "docker build -t lobe-chat:local .",
+    "self-hosting:docker-cn": "docker build -t lobe-chat:local --build-arg USE_NPM_CN_MIRROR=true .",
     "start": "next start",
     "stylelint": "stylelint \"src/**/*.{js,jsx,ts,tsx}\" --fix",
     "test": "npm run test-app && npm run test-server",

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: {