Merge branch 'v3-dev' into v3

Author: Zerlight

packages/backend/src/libs/jwt/jwt.service.ts

@@ -19,8 +19,16 @@ export type JWTPayload = JWTPayloadDefault & {
 export class JwtService {
   constructor(private configService: ConfigService) {}
 
-  async getKey(type: 'public' | 'private') {
+  async getKey(type: 'public' | 'private', refresh = false) {
     switch (this.configService.get('jwt').algorithm) {
+      case 'HS256':
+        if (refresh) {
+          const refreshSecret = this.configService.get('jwt')?.refreshSecret;
+          if (refreshSecret) {
+            return new TextEncoder().encode(refreshSecret);
+          }
+        }
+        return new TextEncoder().encode(this.configService.get('jwt').secret);
       case 'ES256':
         if (type === 'private') {
           return await importJWK(
@@ -32,23 +40,28 @@ export class JwtService {
           JSON.parse(this.configService.get('jwt').publicKey),
           'ES256',
         );
-      case 'HS256':
-        return new TextEncoder().encode(this.configService.get('jwt').secret);
     }
   }
 
-  async sign(payload: JWTPayload): Promise<string> {
+  async sign(
+    payload: JWTPayload,
+    duration = 7 * 24 * 60 * 60,
+    refresh = false,
+  ): Promise<string> {
     const iat = Math.floor(Date.now() / 1000); // Not before: Now
-    const exp = iat + 7 * 24 * 60 * 60; // One week
-    return await new SignJWT({ ...payload })
+    const exp = iat + duration; // One week
+    return await new SignJWT({
+      ...payload,
+      ...(refresh ? { sub: 'refresh' } : {}),
+    })
       .setProtectedHeader({
         alg: this.configService.get('jwt').algorithm,
         typ: 'JWT',
       })
       .setExpirationTime(exp)
       .setIssuedAt(iat)
       .setNotBefore(iat)
-      .sign(await this.getKey('private'));
+      .sign(await this.getKey('private', refresh));
   }
 
   async verify(token: string): Promise<JWTPayload> {

packages/backend/src/modules/auth/auth.controller.ts

@@ -5,6 +5,7 @@ import { ConfigService } from '@/common/config';
 import { BizException } from '@/common/exceptions/biz.exception';
 import { Payload, Public } from '@/common/guards/auth.guard';
 import { ZodValidationPipe } from '@/common/pipes/zod';
+import { JWTPayload } from '@/libs/jwt/jwt.service';
 import { WechatService } from '@/modules/auth/wechat.service';
 
 import { AuthDTO, ErrorCodeEnum } from 'shared';
@@ -185,4 +186,12 @@ export class AuthController {
       data: roles,
     };
   }
+
+  @Get('refresh')
+  async refresh(@Payload() payload: JWTPayload) {
+    return {
+      success: true,
+      ...(await this.authService.refresh(payload.id, payload.role)),
+    };
+  }
 }

packages/backend/src/modules/auth/auth.service.ts

@@ -62,18 +62,19 @@ export class AuthService {
    * 1. 检查是否绑定账户
    * 2. 检查是否设置密码
    */
-  async #signWithCheck(user: any): Promise<{
-    token: string;
-    status: IAccountStatus;
-  }> {
+  async #signWithCheck(user: any) {
     let status: IAccountStatus = 'ok';
     if (!user.email && !user.phone) {
       status = 'bind';
     } else if (!user.newPassword) {
       status = 'password';
     }
     return {
-      token: await this.jwt.sign({ id: user.id, role: user.role }),
+      sessionToken: await this.jwt.sign({ id: user.id, role: user.role }),
+      refreshToken: await this.jwt.sign(
+        { id: user.id, role: user.role },
+        30 * 24 * 60 * 60,
+      ),
       status,
     };
   }
@@ -342,4 +343,8 @@ export class AuthService {
       },
     });
   }
+
+  async refresh(userId: number, userRole: string) {
+    return this.#signWithCheck({ id: userId, role: userRole });
+  }
 }

packages/backend/src/modules/chat/chat.controller.ts

@@ -164,7 +164,7 @@ export class ChatController {
       modelId: data.modelId,
       input: data.content,
       messages: chatSession.messages,
-      // key,
+      topic: chatSession.topic,
     });
   }
 }

packages/backend/src/modules/chat/chat.service.ts

@@ -234,16 +234,15 @@ export class ChatService {
 
   async summarizeTopic(message: string, sessionId: string) {
     const result = (await this.#chat({
-      input: `Give me the topic title about the following text by use as few words as possible.
+      input: `summarize the text in 4 words.
 Text: """
 ${message}
 """`,
       model: 'gpt-3.5-turbo',
       histories: [
         {
           role: 'system',
-          content:
-            'You are an assistant who uses a few words to summarize conversations',
+          content: 'You are an assistant who uses 4 words to summarize text',
         },
       ],
       stream: false,
@@ -263,6 +262,7 @@ ${message}
     input,
     modelId,
     messages, // key,
+    topic,
   }: {
     userId: number;
     sessionId: string;
@@ -273,6 +273,7 @@ ${message}
     messages: ChatMessage[];
     /* Request API Key */
     // key: string;
+    topic?: string;
   }) {
     const { name: model } = await this.prisma.client.model.findUniqueOrThrow({
       where: { id: modelId },
@@ -338,6 +339,24 @@ ${message}
             }),
           ]);
           subscriber.complete();
+          /* 首次对话自动总结对话，
+           * First conversation automatically summarizes the conversation
+           */
+          if (!topic) {
+            await this.summarizeTopic(
+              [
+                ...histories,
+                { role: 'user', content: input },
+                {
+                  role: 'assistant',
+                  content: generated,
+                },
+              ]
+                .map((m) => `${m.role}: ${m.content}`)
+                .join('\n'),
+              sessionId,
+            );
+          }
         }
       })();
     });

packages/frontend/.eslintrc.json

@@ -7,8 +7,7 @@
   },
   "rules": {
     "@next/next/no-html-link-for-pages": [
-      "error",
-      "packages/frontend/src/app"
+      "off"
     ]
   }
 }

packages/frontend/package.json

@@ -18,7 +18,6 @@
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/themes": "^2.0.0",
     "@svgr/webpack": "^8.1.0",
-    "@tremor/react": "^3.11.1",
     "@types/ramda": "^0.29.7",
     "clsx": "^2.0.0",
     "emoji-picker-react": "^4.4.7",

packages/frontend/src/app/(admin-end)/dashboard/page.tsx

@@ -3,7 +3,6 @@
 import useSWR from 'swr';
 
 import { Box, Grid, Text } from '@radix-ui/themes';
-import { Card, LineChart, Title } from '@tremor/react';
 
 import { Loading } from '@/components/loading';
 import { useStore } from '@/store';
@@ -32,14 +31,14 @@ export default function DashboardIndex() {
   return (
     <Grid columns="6" gap="3" width="auto">
       {analytics.map((item) => (
-        <Card key={item.key}>
+        <Box key={item.key}>
           <Text as="p" size="2" weight="medium">
             {item.label}
           </Text>
           <Text as="p" size="6" weight="bold">
             {data[item.key]}
           </Text>
-        </Card>
+        </Box>
       ))}
     </Grid>
   );

packages/frontend/src/app/(admin-end)/layout.tsx

@@ -4,7 +4,8 @@ import '@radix-ui/themes/styles.css';
 import '@/styles/dashboard.css';
 
 export const metadata = {
-  title: 'Dashboard ｜ ChatGPT Admin ',
+  title: 'Dashboard ｜ ChatGPT Admin Web',
+  description: 'Manage Dashboard for ChatGPT Admin Web',
 };
 
 export default function AdminEndLayout({

packages/frontend/src/app/auth/page.tsx

@@ -29,7 +29,7 @@ const weChatOauthRedirectUrl =
 /* 验证码登录/注册 */
 function ValidateCodeLogin() {
   const router = useRouter();
-  const { fetcher, setSessionToken } = useStore();
+  const { fetcher, setAuthToken } = useStore();
   const [identity, setIdentity] = useState('');
   const [ifCodeSent, setIfCodeSent] = useState(false);
   const [validateCode, setValidateCode] = useState('');
@@ -65,7 +65,7 @@ function ValidateCodeLogin() {
       .then((res) => res.json())
       .then((res) => {
         if (res.success) {
-          setSessionToken(res.token);
+          setAuthToken(res.sessionToken, res.refreshToken);
           return router.push('/');
         } else {
           showToast(res.message);
@@ -151,7 +151,7 @@ function ValidateCodeLogin() {
 /* 密码登录 */
 const PasswordLogin: React.FC = () => {
   const router = useRouter();
-  const { fetcher, setSessionToken } = useStore();
+  const { fetcher, setAuthToken } = useStore();
   const [identity, setIdentity] = useState('');
   const [password, setPassword] = useState('');
   const [isSubmitting, handleSubmit] = usePreventFormSubmit();
@@ -165,7 +165,7 @@ const PasswordLogin: React.FC = () => {
       .then((res) => res.json())
       .then((res) => {
         if (res.success) {
-          setSessionToken(res.token);
+          setAuthToken(res.sessionToken, res.refreshToken);
           router.push('/');
         } else {
           router.refresh();