4.8.5 test (#1805)

* perf: revert tip * feat: create copy app * perf: file stream read * perf: read directory over 100 files * perf: index * fix: team chat api error * lock * fix: i18n file
2025-08-02 12:48:30 +00:00 · 2024-06-21 10:09:00 +08:00
parent 980b4d3db5
commit 5cc01b8509
57 changed files with 8660 additions and 10755 deletions
--- a/projects/app/src/pages/api/common/file/read.ts
+++ b/projects/app/src/pages/api/common/file/read.ts
@@ -4,6 +4,7 @@ import { connectToDatabase } from '@/service/mongo';
 import { authFileToken } from '@fastgpt/service/support/permission/controller';
 import { getDownloadStream, getFileById } from '@fastgpt/service/common/file/gridfs/controller';
 import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
+import { stream2Encoding } from '@fastgpt/service/common/file/gridfs/utils';

 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
@@ -17,7 +18,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
      throw new Error('fileId is empty');
    }

-    const [file, { fileStream, encoding }] = await Promise.all([
+    const [file, fileStream] = await Promise.all([
      getFileById({ bucketName, fileId }),
      getDownloadStream({ bucketName, fileId })
    ]);
@@ -26,16 +27,26 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
      return Promise.reject(CommonErrEnum.fileNotFound);
    }

+    const { stream, encoding } = await (async () => {
+      if (file.metadata?.encoding) {
+        return {
+          stream: fileStream,
+          encoding: file.metadata.encoding
+        };
+      }
+      return stream2Encoding(fileStream);
+    })();
+
    res.setHeader('Content-Type', `${file.contentType}; charset=${encoding}`);
    res.setHeader('Cache-Control', 'public, max-age=3600');
    res.setHeader('Content-Disposition', `inline; filename="${encodeURIComponent(file.filename)}"`);

-    fileStream.pipe(res);
+    stream.pipe(res);

-    fileStream.on('error', () => {
+    stream.on('error', () => {
      res.status(500).end();
    });
-    fileStream.on('end', () => {
+    stream.on('end', () => {
      res.end();
    });
  } catch (error) {
@@ -47,6 +58,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 }
 export const config = {
  api: {
-    responseLimit: '32mb'
+    responseLimit: '100mb'
  }
 };
--- a/projects/app/src/pages/api/core/app/copy.ts
+++ b/projects/app/src/pages/api/core/app/copy.ts
@@ -0,0 +1,50 @@
+import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
+import { NextAPI } from '@/service/middleware/entry';
+import { authApp } from '@fastgpt/service/support/permission/app/auth';
+import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
+import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
+import { onCreateApp } from './create';
+
+export type copyAppQuery = {};
+
+export type copyAppBody = { appId: string };
+
+export type copyAppResponse = {
+  appId: string;
+};
+
+async function handler(
+  req: ApiRequestProps<copyAppBody, copyAppQuery>,
+  res: ApiResponseType<any>
+): Promise<copyAppResponse> {
+  const [{ app, tmbId }] = await Promise.all([
+    authApp({
+      req,
+      authToken: true,
+      per: WritePermissionVal,
+      appId: req.body.appId
+    }),
+    authUserPer({
+      req,
+      authToken: true,
+      per: WritePermissionVal
+    })
+  ]);
+
+  const appId = await onCreateApp({
+    parentId: app.parentId,
+    name: app.name + ' Copy',
+    intro: app.intro,
+    avatar: app.avatar,
+    type: app.type,
+    modules: app.modules,
+    edges: app.edges,
+    teamId: app.teamId,
+    tmbId,
+    pluginData: app.pluginData
+  });
+
+  return { appId };
+}
+
+export default NextAPI(handler);
--- a/projects/app/src/pages/api/core/app/update.ts
+++ b/projects/app/src/pages/api/core/app/update.ts
@@ -42,27 +42,22 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  const { nodes: formatNodes } = beforeUpdateAppFormat({ nodes });

  // 更新模型
-  await MongoApp.updateOne(
-    {
-      _id: appId
-    },
-    {
-      ...parseParentIdInMongo(parentId),
-      name,
-      type,
-      avatar,
-      intro,
-      defaultPermission,
-      ...(teamTags && teamTags),
-      ...(formatNodes && {
-        modules: formatNodes
-      }),
-      ...(edges && {
-        edges
-      }),
-      ...(chatConfig && { chatConfig })
-    }
-  );
+  await MongoApp.findByIdAndUpdate(appId, {
+    ...parseParentIdInMongo(parentId),
+    ...(name && { name }),
+    ...(type && { type }),
+    ...(avatar && { avatar }),
+    ...(intro !== undefined && { intro }),
+    ...(defaultPermission && { defaultPermission }),
+    ...(teamTags && { teamTags }),
+    ...(formatNodes && {
+      modules: formatNodes
+    }),
+    ...(edges && {
+      edges
+    }),
+    ...(chatConfig && { chatConfig })
+  });
 }

 export default NextAPI(handler);
--- a/projects/app/src/pages/api/core/chat/delHistory.ts
+++ b/projects/app/src/pages/api/core/chat/delHistory.ts
@@ -1,50 +1,42 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
 import { DelHistoryProps } from '@/global/core/chat/api';
 import { autChatCrud } from '@/service/support/permission/auth/chat';
 import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
+import { NextAPI } from '@/service/middleware/entry';
+import { ApiRequestProps } from '@fastgpt/service/type/next';

 /* clear chat history */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
-    const { appId, chatId, shareId, outLinkUid } = req.query as DelHistoryProps;
+async function handler(req: ApiRequestProps<{}, DelHistoryProps>, res: NextApiResponse) {
+  const { appId, chatId } = req.query;

-    await autChatCrud({
-      req,
-      authToken: true,
-      appId,
-      chatId,
-      shareId,
-      outLinkUid,
-      per: 'w'
-    });
+  await autChatCrud({
+    req,
+    authToken: true,
+    ...req.query,
+    per: 'w'
+  });

-    await mongoSessionRun(async (session) => {
-      await MongoChatItem.deleteMany(
-        {
-          appId,
-          chatId
-        },
-        { session }
-      );
-      await MongoChat.findOneAndRemove(
-        {
-          appId,
-          chatId
-        },
-        { session }
-      );
-    });
+  await mongoSessionRun(async (session) => {
+    await MongoChatItem.deleteMany(
+      {
+        appId,
+        chatId
+      },
+      { session }
+    );
+    await MongoChat.findOneAndRemove(
+      {
+        appId,
+        chatId
+      },
+      { session }
+    );
+  });

-    jsonRes(res);
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
+  jsonRes(res);
 }
+
+export default NextAPI(handler);
--- a/projects/app/src/pages/api/core/chat/initLocalShareHistoryV464.ts
+++ b/projects/app/src/pages/api/core/chat/initLocalShareHistoryV464.ts
@@ -1,42 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
-import { ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
-
-/* clear chat history */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
-    const { outLinkUid, chatIds } = req.body as {
-      outLinkUid: string;
-      chatIds: string[];
-    };
-
-    if (!outLinkUid) {
-      throw new Error('shareId or outLinkUid is required');
-    }
-
-    const sliceIds = chatIds.slice(0, 50);
-
-    await MongoChat.updateMany(
-      {
-        chatId: { $in: sliceIds },
-        source: ChatSourceEnum.share,
-        outLinkUid: { $exists: false }
-      },
-      {
-        $set: {
-          outLinkUid
-        }
-      }
-    );
-
-    jsonRes(res);
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}
--- a/projects/app/src/pages/api/core/chat/item/delete.ts
+++ b/projects/app/src/pages/api/core/chat/item/delete.ts
@@ -4,37 +4,30 @@ import { connectToDatabase } from '@/service/mongo';
 import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
 import { autChatCrud } from '@/service/support/permission/auth/chat';
 import type { DeleteChatItemProps } from '@/global/core/chat/api.d';
+import { NextAPI } from '@/service/middleware/entry';
+import { ApiRequestProps } from '@fastgpt/service/type/next';

-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
-    const { appId, chatId, contentId, shareId, outLinkUid } = req.query as DeleteChatItemProps;
+async function handler(req: ApiRequestProps<{}, DeleteChatItemProps>, res: NextApiResponse) {
+  const { appId, chatId, contentId, shareId, outLinkUid } = req.query;

-    if (!contentId || !chatId) {
-      return jsonRes(res);
-    }
-
-    await autChatCrud({
-      req,
-      authToken: true,
-      appId,
-      chatId,
-      shareId,
-      outLinkUid,
-      per: 'w'
-    });
-
-    await MongoChatItem.deleteOne({
-      appId,
-      chatId,
-      dataId: contentId
-    });
-
-    jsonRes(res);
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
+  if (!contentId || !chatId) {
+    return jsonRes(res);
  }
+
+  await autChatCrud({
+    req,
+    authToken: true,
+    ...req.query,
+    per: 'w'
+  });
+
+  await MongoChatItem.deleteOne({
+    appId,
+    chatId,
+    dataId: contentId
+  });
+
+  jsonRes(res);
 }
+
+export default NextAPI(handler);
--- a/projects/app/src/pages/api/core/chat/updateHistory.ts
+++ b/projects/app/src/pages/api/core/chat/updateHistory.ts
@@ -1,40 +1,30 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
 import { UpdateHistoryProps } from '@/global/core/chat/api.d';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { autChatCrud } from '@/service/support/permission/auth/chat';
+import { NextAPI } from '@/service/middleware/entry';
+import { ApiRequestProps } from '@fastgpt/service/type/next';

 /* update chat top, custom title */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
-    const { appId, chatId, teamId, shareId, outLinkUid, customTitle, top } =
-      req.body as UpdateHistoryProps;
-    await autChatCrud({
-      req,
-      authToken: true,
-      appId,
-      teamId,
-      chatId,
-      shareId,
-      outLinkUid,
-      per: 'w'
-    });
+async function handler(req: ApiRequestProps<UpdateHistoryProps>, res: NextApiResponse) {
+  const { appId, chatId, customTitle, top } = req.body;
+  await autChatCrud({
+    req,
+    authToken: true,
+    ...req.body,
+    per: 'w'
+  });

-    await MongoChat.findOneAndUpdate(
-      { appId, chatId },
-      {
-        updateTime: new Date(),
-        ...(customTitle !== undefined && { customTitle }),
-        ...(top !== undefined && { top })
-      }
-    );
-    jsonRes(res);
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
+  await MongoChat.findOneAndUpdate(
+    { appId, chatId },
+    {
+      updateTime: new Date(),
+      ...(customTitle !== undefined && { customTitle }),
+      ...(top !== undefined && { top })
+    }
+  );
+  jsonRes(res);
 }
+
+export default NextAPI(handler);