perf: sse response

client/src/service/utils/auth.ts

@@ -163,7 +163,7 @@ export const authUser = async ({
 
 /* random get openai api key */
 export const getSystemOpenAiKey = () => {
-  return process.env.OPENAIKEY || '';
+  return process.env.ONEAPI_KEY || process.env.OPENAIKEY || '';
 };
 
 /* 获取 api 请求的 key */

client/src/service/utils/chat/index.ts

@@ -6,8 +6,8 @@ import { sseResponse } from '../tools';
 import { OpenAiChatEnum } from '@/constants/model';
 import { chatResponse, openAiStreamResponse } from './openai';
 import type { NextApiResponse } from 'next';
-import { createParser, ParsedEvent, ReconnectInterval } from 'eventsource-parser';
 import { textAdaptGptResponse } from '@/utils/adapt';
+import { parseStreamChunk } from '@/utils/adapt';
 
 export type ChatCompletionType = {
   apiKey: string;
@@ -185,65 +185,62 @@ export const V2_StreamResponse = async ({
   model: ChatModelType;
 }) => {
   let responseContent = '';
+  let error: any = null;
+
+  const clientRes = async (data: string) => {
+    const { content = '' } = (() => {
+      try {
+        const json = JSON.parse(data);
+        const content: string = json?.choices?.[0].delta.content || '';
+        error = json.error;
+        responseContent += content;
+        return { content };
+      } catch (error) {
+        return {};
+      }
+    })();
+
+    if (res.closed || error) return;
+
+    if (data === '[DONE]') {
+      sseResponse({
+        res,
+        event: sseResponseEventEnum.answer,
+        data: textAdaptGptResponse({
+          text: null,
+          finish_reason: 'stop'
+        })
+      });
+      sseResponse({
+        res,
+        event: sseResponseEventEnum.answer,
+        data: '[DONE]'
+      });
+    } else {
+      sseResponse({
+        res,
+        event: sseResponseEventEnum.answer,
+        data: textAdaptGptResponse({
+          text: content
+        })
+      });
+    }
+  };
 
   try {
-    const onParse = async (e: ParsedEvent | ReconnectInterval) => {
-      if (e.type !== 'event') return;
-
-      const data = e.data;
-
-      const { content = '' } = (() => {
-        try {
-          const json = JSON.parse(data);
-          const content: string = json?.choices?.[0].delta.content || '';
-          responseContent += content;
-          return { content };
-        } catch (error) {}
-        return {};
-      })();
-
-      if (res.closed) return;
-
-      if (data === '[DONE]') {
-        sseResponse({
-          res,
-          event: sseResponseEventEnum.answer,
-          data: textAdaptGptResponse({
-            text: null,
-            finish_reason: 'stop'
-          })
-        });
-        sseResponse({
-          res,
-          event: sseResponseEventEnum.answer,
-          data: '[DONE]'
-        });
-      } else {
-        sseResponse({
-          res,
-          event: sseResponseEventEnum.answer,
-          data: textAdaptGptResponse({
-            text: content
-          })
-        });
-      }
-    };
-
-    try {
-      const parser = createParser(onParse);
-      const decoder = new TextDecoder();
-      for await (const chunk of chatResponse.data as any) {
-        if (res.closed) {
-          break;
-        }
-        parser.feed(decoder.decode(chunk, { stream: true }));
-      }
-    } catch (error) {
-      console.log('pipe error', error);
+    for await (const chunk of chatResponse.data as any) {
+      if (res.closed) break;
+      const parse = parseStreamChunk(chunk);
+      parse.forEach((item) => clientRes(item.data));
     }
   } catch (error) {
-    console.log('stream error', error);
+    console.log('pipe error', error);
   }
+
+  if (error) {
+    return Promise.reject(error);
+  }
+
   // count tokens
   const finishMessages = prompts.concat({
     obj: ChatRoleEnum.AI,

client/src/service/utils/chat/openai.ts

@@ -1,18 +1,20 @@
 import { Configuration, OpenAIApi } from 'openai';
-import { createParser, ParsedEvent, ReconnectInterval } from 'eventsource-parser';
 import { axiosConfig } from '../tools';
 import { ChatModelMap, OpenAiChatEnum } from '@/constants/model';
 import { adaptChatItem_openAI } from '@/utils/plugin/openai';
 import { modelToolMap } from '@/utils/plugin';
 import { ChatCompletionType, ChatContextFilter, StreamResponseType } from './index';
 import { ChatRoleEnum } from '@/constants/chat';
+import { parseStreamChunk } from '@/utils/adapt';
 
-export const getOpenAIApi = () =>
-  new OpenAIApi(
+export const getOpenAIApi = (apiKey: string) => {
+  const openaiBaseUrl = process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1';
+  return new OpenAIApi(
     new Configuration({
-      basePath: process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1'
+      basePath: apiKey === process.env.ONEAPI_KEY ? process.env.ONEAPI_URL : openaiBaseUrl
     })
   );
+};
 
 /* 模型对话 */
 export const chatResponse = async ({
@@ -31,7 +33,7 @@ export const chatResponse = async ({
   });
 
   const adaptMessages = adaptChatItem_openAI({ messages: filterMessages, reserveId: false });
-  const chatAPI = getOpenAIApi();
+  const chatAPI = getOpenAIApi(apiKey);
 
   const promptsToken = modelToolMap[model].countTokens({
     messages: filterMessages
@@ -80,29 +82,29 @@ export const openAiStreamResponse = async ({
   try {
     let responseContent = '';
 
-    const onParse = async (event: ParsedEvent | ReconnectInterval) => {
-      if (event.type !== 'event') return;
-      const data = event.data;
-      if (data === '[DONE]') return;
-      try {
-        const json = JSON.parse(data);
-        const content: string = json?.choices?.[0].delta.content || '';
-        responseContent += content;
+    const clientRes = async (data: string) => {
+      const { content = '' } = (() => {
+        try {
+          const json = JSON.parse(data);
+          const content: string = json?.choices?.[0].delta.content || '';
+          responseContent += content;
+          return { content };
+        } catch (error) {
+          return {};
+        }
+      })();
 
-        !res.closed && content && res.write(content);
-      } catch (error) {
-        error;
-      }
+      if (data === '[DONE]') return;
+
+      !res.closed && content && res.write(content);
     };
 
     try {
-      const decoder = new TextDecoder();
-      const parser = createParser(onParse);
       for await (const chunk of chatResponse.data as any) {
-        if (res.closed) {
-          break;
-        }
-        parser.feed(decoder.decode(chunk, { stream: true }));
+        if (res.closed) break;
+
+        const parse = parseStreamChunk(chunk);
+        parse.forEach((item) => clientRes(item.data));
       }
     } catch (error) {
       console.log('pipe error', error);

client/src/service/utils/tools.ts

@@ -34,14 +34,18 @@ export const clearCookie = (res: NextApiResponse) => {
 };
 
 /* openai axios config */
-export const axiosConfig = (apikey: string) => ({
-  baseURL: process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1',
-  httpsAgent: global.httpsAgent,
-  headers: {
-    Authorization: `Bearer ${apikey}`,
-    auth: process.env.OPENAI_BASE_URL_AUTH || ''
-  }
-});
+export const axiosConfig = (apikey: string) => {
+  const openaiBaseUrl = process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1';
+
+  return {
+    baseURL: apikey === process.env.ONEAPI_KEY ? process.env.ONEAPI_URL : openaiBaseUrl, // 此处仅对非 npm 模块有效
+    httpsAgent: global.httpsAgent,
+    headers: {
+      Authorization: `Bearer ${apikey}`,
+      auth: process.env.OPENAI_BASE_URL_AUTH || ''
+    }
+  };
+};
 
 export function withNextCors(handler: NextApiHandler): NextApiHandler {
   return async function nextApiHandlerWrappedWithNextCors(