lock (#2063)

* lock

* perf: init data

* perf: vision model url

* fix: chat index

projects/app/package.json

@@ -41,7 +41,7 @@
     "lodash": "^4.17.21",
     "mermaid": "^10.2.3",
     "nanoid": "^4.0.1",
-    "next": "14.2.3",
+    "next": "14.2.5",
     "json5": "^2.2.3",
     "nextjs-node-loader": "^1.1.5",
     "nprogress": "^0.2.0",
@@ -71,7 +71,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/jsonwebtoken": "^9.0.3",
     "@types/lodash": "^4.14.191",
-    "@types/node": "20.14.0",
+    "@types/node": "^20.14.2",
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.0",
     "@types/react-syntax-highlighter": "^15.5.6",
@@ -81,4 +81,4 @@
     "nextjs-node-loader": "^1.1.5",
     "typescript": "^5.1.3"
   }
-}
+}

projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx

@@ -86,7 +86,7 @@ const ChatInput = ({
           });
           updateFile(fileIndex, {
             ...file,
-            url: `${location.origin}${url}`
+            url
           });
         } catch (error) {
           removeFile(fileIndex);

projects/app/src/pages/api/common/system/getInitData.ts

@@ -6,16 +6,15 @@ import type { InitDateResponse } from '@/global/common/api/systemRes';
 import type { FastGPTConfigFileType } from '@fastgpt/global/common/system/types/index.d';
 import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
 import { getFastGPTConfigFromDB } from '@fastgpt/service/common/system/config/controller';
-import { connectToDatabase } from '@/service/mongo';
 import { PluginTemplateType } from '@fastgpt/global/core/plugin/type';
 import { readConfigData } from '@/service/common/system';
-import { exit } from 'process';
 import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 import { initFastGPTConfig } from '@fastgpt/service/common/system/tools';
 import json5 from 'json5';
 import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type';
+import { connectToDatabase } from '@/service/mongo';
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+async function handler(req: NextApiRequest, res: NextApiResponse) {
   await getInitConfig();
 
   jsonRes<InitDateResponse>(res, {
@@ -37,6 +36,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   });
 }
 
+export default handler;
+
 const defaultFeConfigs: FastGPTFeConfigsType = {
   show_emptyChat: true,
   show_git: true,
@@ -55,29 +56,18 @@ const defaultFeConfigs: FastGPTFeConfigsType = {
 };
 
 export async function getInitConfig() {
-  if (global.systemInitd) return;
-  global.systemInitd = true;
-
-  try {
+  // First request
+  if (!global.systemInited) {
     await connectToDatabase();
-
-    await Promise.all([
-      initSystemConfig(),
-      // getSimpleModeTemplates(),
-      getSystemVersion(),
-      getSystemPlugin(),
-
-      // abandon
-      getSystemPluginV1()
-    ]);
-  } catch (error) {
-    console.error('Load init config error', error);
-    global.systemInitd = false;
-
-    if (!global.feConfigs) {
-      exit(1);
-    }
   }
+  return Promise.all([
+    initSystemConfig(),
+    getSystemVersion(),
+    getSystemPlugin(),
+
+    // abandon
+    getSystemPluginV1()
+  ]);
 }
 
 export async function initSystemConfig() {

projects/app/src/pages/api/core/dataset/update.ts

@@ -33,8 +33,6 @@ async function handler(req: NextApiRequest) {
     await authDataset({ req, authToken: true, datasetId: id, per: WritePermissionVal });
   }
 
-  console.log('update dataset', req.body);
-
   await MongoDataset.findOneAndUpdate(
     {
       _id: id

projects/app/src/service/common/api/request.ts

@@ -1,114 +0,0 @@
-import { SERVICE_LOCAL_HOST } from '@fastgpt/service/common/system/tools';
-import axios, { Method, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-
-interface ConfigType {
-  headers?: { [key: string]: string };
-  hold?: boolean;
-  timeout?: number;
-}
-interface ResponseDataType {
-  code: number;
-  message: string;
-  data: any;
-}
-
-/**
- * 请求开始
- */
-function requestStart(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig {
-  return config;
-}
-
-/**
- * 请求成功,检查请求头
- */
-function responseSuccess(response: AxiosResponse<ResponseDataType>) {
-  return response;
-}
-/**
- * 响应数据检查
- */
-function checkRes(data: ResponseDataType) {
-  if (data === undefined) {
-    console.log('error->', data, 'data is empty');
-    return Promise.reject('服务器异常');
-  } else if (data?.code && (data.code < 200 || data.code >= 400)) {
-    return Promise.reject(data);
-  }
-  return data.data;
-}
-
-/**
- * 响应错误
- */
-function responseError(err: any) {
-  if (!err) {
-    return Promise.reject({ message: '未知错误' });
-  }
-  if (typeof err === 'string') {
-    return Promise.reject({ message: err });
-  }
-
-  if (err?.response?.data) {
-    return Promise.reject(err?.response?.data);
-  }
-  return Promise.reject(err);
-}
-
-/* 创建请求实例 */
-const instance = axios.create({
-  timeout: 60000, // 超时时间
-  headers: {
-    'content-type': 'application/json',
-    'Cache-Control': 'no-cache'
-  }
-});
-
-/* 请求拦截 */
-instance.interceptors.request.use(requestStart, (err) => Promise.reject(err));
-/* 响应拦截 */
-instance.interceptors.response.use(responseSuccess, (err) => Promise.reject(err));
-
-export function request(url: string, data: any, config: ConfigType, method: Method): any {
-  /* 去空 */
-  for (const key in data) {
-    if (data[key] === null || data[key] === undefined) {
-      delete data[key];
-    }
-  }
-
-  return instance
-    .request({
-      baseURL: `http://${SERVICE_LOCAL_HOST}`,
-      url,
-      method,
-      data: ['POST', 'PUT'].includes(method) ? data : null,
-      params: !['POST', 'PUT'].includes(method) ? data : null,
-      ...config // custom config
-    })
-    .then((res) => checkRes(res.data))
-    .catch((err) => responseError(err));
-}
-
-/**
- * api请求方式
- * @param {String} url
- * @param {Any} params
- * @param {Object} config
- * @returns
- */
-export function GET<T = undefined>(url: string, params = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, params, config, 'GET');
-}
-
-export function POST<T = undefined>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, data, config, 'POST');
-}
-
-export function PUT<T = undefined>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, data, config, 'PUT');
-}
-
-export function DELETE<T = undefined>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, data, config, 'DELETE');
-}

projects/app/src/service/mongo.ts

@@ -22,10 +22,6 @@ export function connectToDatabase() {
       initGlobal();
     },
     afterHook: async () => {
-      if (global.systemInitd) return;
-
-      global.systemInitd = true;
-
       systemStartCb();
 
       //init system config；init vector database；init root user

projects/app/src/types/index.d.ts

@@ -20,8 +20,6 @@ export type PagingData<T> = {
 export type RequestPaging = { pageNum: number; pageSize: number; [key]: any };
 
 declare global {
-  var systemInitd: boolean;
-
   var qaQueueLen: number;
   var vectorQueueLen: number;
 

projects/sandbox/package.json

@@ -35,7 +35,7 @@
     "@nestjs/schematics": "^10.0.0",
     "@nestjs/testing": "^10.0.0",
     "@types/jest": "^29.5.2",
-    "@types/node": "20.14.0",
+    "@types/node": "^20.14.2",
     "@types/supertest": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",