v4.2 (#217)

* fix: chat module link

* fix: url fetch check

* fix: import file ui

* feat: app logs

* perf: iframe icon

* imgs cdn

* perf: click range and pg

client/src/pages/api/chat/getChatLogs.ts

@@ -0,0 +1,72 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { Chat, ChatItem, connectToDatabase } from '@/service/mongo';
+import { authUser } from '@/service/utils/auth';
+import type { PagingData } from '@/types';
+import { AppLogsListItemType } from '@/types/app';
+import { Types } from 'mongoose';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    const {
+      pageNum = 1,
+      pageSize = 20,
+      appId
+    } = req.body as { pageNum: number; pageSize: number; appId: string };
+
+    if (!appId) {
+      throw new Error('缺少参数');
+    }
+    await connectToDatabase();
+
+    // 凭证校验
+    const { userId } = await authUser({ req, authToken: true });
+
+    const where = {
+      appId: new Types.ObjectId(appId),
+      userId: new Types.ObjectId(userId)
+    };
+
+    const [data, total] = await Promise.all([
+      Chat.aggregate([
+        { $match: where },
+        { $sort: { updateTime: -1 } },
+        { $skip: (pageNum - 1) * pageSize },
+        { $limit: pageSize },
+        {
+          $lookup: {
+            from: 'chatitems',
+            localField: 'chatId',
+            foreignField: 'chatId',
+            as: 'messageCount'
+          }
+        },
+        {
+          $project: {
+            id: '$chatId',
+            title: 1,
+            source: 1,
+            time: '$updateTime',
+            messageCount: { $size: '$messageCount' },
+            callbackCount: { $literal: 0 }
+          }
+        }
+      ]),
+      Chat.countDocuments(where)
+    ]);
+
+    jsonRes<PagingData<AppLogsListItemType>>(res, {
+      data: {
+        pageNum,
+        pageSize,
+        data,
+        total
+      }
+    });
+  } catch (error) {
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+}

client/src/pages/api/openapi/v1/chat/completions.ts

@@ -27,6 +27,7 @@ import { pushTaskBill } from '@/service/events/pushBill';
 import { BillSourceEnum } from '@/constants/user';
 import { ChatHistoryItemResType } from '@/types/chat';
 import { UserModelSchema } from '@/types/mongoSchema';
+import { SystemInputEnum } from '@/constants/app';
 
 export type MessageItemType = ChatCompletionRequestMessage & { dataId?: string };
 type FastGptWebChatProps = {
@@ -302,6 +303,8 @@ export async function dispatchModules({
 
         if (!set.has(module.moduleId) && checkInputFinish()) {
           set.add(module.moduleId);
+          // remove switch
+          updateInputValue(SystemInputEnum.switch, undefined);
           return moduleRun(module);
         }
       })
@@ -324,6 +327,7 @@ export async function dispatchModules({
             // find module
             const targetModule = runningModules.find((item) => item.moduleId === target.moduleId);
             if (!targetModule) return;
+
             return moduleInput(targetModule, { [target.key]: outputItem.value });
           })
         );
@@ -332,7 +336,6 @@ export async function dispatchModules({
   }
   async function moduleRun(module: RunningModuleItemType): Promise<any> {
     if (res.closed) return Promise.resolve();
-    // console.log('run=========', module.flowType);
 
     if (stream && detail && module.showStatus) {
       responseStatus({

client/src/pages/api/plugins/urlFetch.ts

@@ -12,7 +12,7 @@ export type UrlFetchResponse = FetchResultItem[];
 
 const fetchContent = async (req: NextApiRequest, res: NextApiResponse) => {
   try {
-    const { urlList = [] } = req.body as { urlList: string[] };
+    let { urlList = [] } = req.body as { urlList: string[] };
 
     if (!urlList || urlList.length === 0) {
       throw new Error('urlList is empty');
@@ -20,27 +20,36 @@ const fetchContent = async (req: NextApiRequest, res: NextApiResponse) => {
 
     await authUser({ req });
 
+    urlList = urlList.filter((url) => /^(http|https):\/\/[^ "]+$/.test(url));
+
     const response = (
       await Promise.allSettled(
         urlList.map(async (url) => {
-          const fetchRes = await axios.get(url, {
-            timeout: 30000
-          });
+          try {
+            const fetchRes = await axios.get(url, {
+              timeout: 30000
+            });
 
-          const dom = new JSDOM(fetchRes.data, {
-            url,
-            contentType: 'text/html'
-          });
+            const dom = new JSDOM(fetchRes.data, {
+              url,
+              contentType: 'text/html'
+            });
 
-          const reader = new Readability(dom.window.document);
-          const article = reader.parse();
+            const reader = new Readability(dom.window.document);
+            const article = reader.parse();
 
-          const content = article?.textContent || '';
+            const content = article?.textContent || '';
 
-          return {
-            url,
-            content: simpleText(`${article?.title}\n${content}`)
-          };
+            return {
+              url,
+              content: simpleText(`${article?.title}\n${content}`)
+            };
+          } catch (error) {
+            return {
+              url,
+              content: ''
+            };
+          }
         })
       )
     )