v4.5 (#403)

packages/common/mongo/init.ts

@@ -29,7 +29,9 @@ export async function connectMongo({
       bufferCommands: true,
       maxConnecting: Number(process.env.DB_MAX_LINK || 5),
       maxPoolSize: Number(process.env.DB_MAX_LINK || 5),
-      minPoolSize: 2
+      minPoolSize: 2,
+      connectTimeoutMS: 20000,
+      waitQueueTimeoutMS: 20000
     });
 
     console.log('mongo connected');

packages/common/package.json

@@ -5,7 +5,9 @@
     "mongoose": "^7.0.2",
     "winston": "^3.10.0",
     "winston-mongodb": "^5.1.1",
-    "axios": "^1.5.1"
+    "axios": "^1.5.1",
+    "nextjs-cors": "^2.1.2",
+    "next": "13.5.2"
   },
   "devDependencies": {
     "@types/node": "^20.8.5"

packages/common/tools/nextjs.ts

@@ -0,0 +1,19 @@
+import type { NextApiResponse, NextApiHandler, NextApiRequest } from 'next';
+import NextCors from 'nextjs-cors';
+
+export function withNextCors(handler: NextApiHandler): NextApiHandler {
+  return async function nextApiHandlerWrappedWithNextCors(
+    req: NextApiRequest,
+    res: NextApiResponse
+  ) {
+    const methods = ['GET', 'eHEAD', 'PUT', 'PATCH', 'POST', 'DELETE'];
+    const origin = req.headers.origin;
+    await NextCors(req, res, {
+      methods,
+      origin: origin,
+      optionsSuccessStatus: 200
+    });
+
+    return handler(req, res);
+  };
+}

packages/common/tools/str.ts

@@ -13,20 +13,10 @@ export const hashStr = (psw: string) => {
 /* simple text, remove chinese space and extra \n */
 export const simpleText = (text: string) => {
   text = text.replace(/([\u4e00-\u9fa5])[\s&&[^\n]]+([\u4e00-\u9fa5])/g, '$1$2');
-  text = text.replace(/\n{2,}/g, '\n');
+  text = text.replace(/\n{3,}/g, '\n\n');
   text = text.replace(/[\s&&[^\n]]{2,}/g, ' ');
   text = text.replace(/[\x00-\x08]/g, ' ');
+  text = text.replace(/\r\n|\r/g, '\n');
 
-  // replace empty \n
-  let newText = '';
-  let lastChar = '';
-  for (let i = 0; i < text.length; i++) {
-    const currentChar = text[i];
-    if (currentChar === '\n' && !/[。？！；.?!;]/g.test(lastChar)) {
-    } else {
-      newText += currentChar;
-    }
-    lastChar = currentChar;
-  }
-  return newText;
+  return text;
 };

packages/common/tools/stream.ts

@@ -0,0 +1,39 @@
+import type { NextApiResponse } from 'next';
+
+export function responseWriteController({
+  res,
+  readStream
+}: {
+  res: NextApiResponse;
+  readStream: any;
+}) {
+  res.on('drain', () => {
+    readStream.resume();
+  });
+
+  return (text: string | Buffer) => {
+    const writeResult = res.write(text);
+    if (!writeResult) {
+      readStream.pause();
+    }
+  };
+}
+
+export function responseWrite({
+  res,
+  write,
+  event,
+  data
+}: {
+  res?: NextApiResponse;
+  write?: (text: string) => void;
+  event?: string;
+  data: string;
+}) {
+  const Write = write || res?.write;
+
+  if (!Write) return;
+
+  event && Write(`event: ${event}\n`);
+  Write(`data: ${data}\n\n`);
+}

packages/core/ai/config.ts

@@ -11,6 +11,7 @@ export const getAIApi = (props?: UserModelSchema['openaiAccount'], timeout = 600
     apiKey: props?.key || systemAIChatKey,
     baseURL: props?.baseUrl || baseUrl,
     httpAgent: global.httpsAgent,
-    timeout
+    timeout,
+    maxRetries: 2
   });
 };

packages/core/ai/type.d.ts

@@ -4,3 +4,9 @@ export type ChatCompletion = OpenAI.Chat.ChatCompletion;
 export type CreateChatCompletionRequest = OpenAI.Chat.ChatCompletionCreateParams;
 
 export type StreamChatType = Stream<OpenAI.Chat.ChatCompletionChunk>;
+
+export type PromptTemplateItem = {
+  title: string;
+  desc: string;
+  value: string;
+};

packages/core/package.json

@@ -5,7 +5,7 @@
     "@fastgpt/common": "workspace:*",
     "@fastgpt/support": "workspace:*",
     "encoding": "^0.1.13",
-    "openai": "^4.11.1",
+    "openai": "^4.12.1",
     "tunnel": "^0.0.6"
   },
   "devDependencies": {

packages/support/outLink/auth.ts

@@ -63,5 +63,6 @@ export type AuthShareChatInitProps = {
 };
 
 export function authShareChatInit(data: AuthShareChatInitProps) {
+  if (!global.feConfigs?.isPlus) return;
   return POST('/support/outLink/authShareChatInit', data);
 }

packages/support/package.json

@@ -5,7 +5,8 @@
     "@fastgpt/common": "workspace:*",
     "cookie": "^0.5.0",
     "jsonwebtoken": "^9.0.2",
-    "axios": "^1.5.1"
+    "axios": "^1.5.1",
+    "next": "13.5.2"
   },
   "devDependencies": {
     "@types/cookie": "^0.5.2",

packages/support/user/auth.ts

@@ -1,8 +1,8 @@
+import type { NextApiResponse, NextApiRequest } from 'next';
 import Cookie from 'cookie';
-import { authJWT } from './tools';
+import jwt from 'jsonwebtoken';
 import { authOpenApiKey } from '../openapi/auth';
 import { authOutLinkId } from '../outLink/auth';
-
 import { MongoUser } from './schema';
 import type { UserModelSchema } from './type.d';
 import { ERROR_ENUM } from '@fastgpt/common/constant/errorCode';
@@ -39,7 +39,7 @@ export const authUser = async ({
   authBalance = false,
   authOutLink
 }: {
-  req: any;
+  req: NextApiRequest;
   authToken?: boolean;
   authRoot?: boolean;
   authApiKey?: boolean;
@@ -165,3 +165,42 @@ export const authUser = async ({
     apikey: openApiKey
   };
 };
+
+/* 生成 token */
+export function generateToken(userId: string) {
+  const key = process.env.TOKEN_KEY as string;
+  const token = jwt.sign(
+    {
+      userId,
+      exp: Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 7
+    },
+    key
+  );
+  return token;
+}
+// auth token
+export function authJWT(token: string) {
+  return new Promise<string>((resolve, reject) => {
+    const key = process.env.TOKEN_KEY as string;
+
+    jwt.verify(token, key, function (err, decoded: any) {
+      if (err || !decoded?.userId) {
+        reject(ERROR_ENUM.unAuthorization);
+        return;
+      }
+      resolve(decoded.userId);
+    });
+  });
+}
+
+/* set cookie */
+export const setCookie = (res: NextApiResponse, token: string) => {
+  res.setHeader(
+    'Set-Cookie',
+    `token=${token}; Path=/; HttpOnly; Max-Age=604800; Samesite=None; Secure;`
+  );
+};
+/* clear cookie */
+export const clearCookie = (res: NextApiResponse) => {
+  res.setHeader('Set-Cookie', 'token=; Path=/; Max-Age=0');
+};

packages/support/user/tools.ts

@@ -1,28 +0,0 @@
-import jwt from 'jsonwebtoken';
-import { ERROR_ENUM } from '@fastgpt/common/constant/errorCode';
-
-/* 生成 token */
-export const generateToken = (userId: string) => {
-  const key = process.env.TOKEN_KEY as string;
-  const token = jwt.sign(
-    {
-      userId,
-      exp: Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 7
-    },
-    key
-  );
-  return token;
-};
-// auth token
-export const authJWT = (token: string) =>
-  new Promise<string>((resolve, reject) => {
-    const key = process.env.TOKEN_KEY as string;
-
-    jwt.verify(token, key, function (err, decoded: any) {
-      if (err || !decoded?.userId) {
-        reject(ERROR_ENUM.unAuthorization);
-        return;
-      }
-      resolve(decoded.userId);
-    });
-  });