Upload 2 files

src/index.js

@@ -4,6 +4,7 @@ const bodyParser = require('koa-bodyparser')
 const models = require("./models")
 const crypto = require('crypto')
 
+
 const app = new Koa()
 const router = new Router()
 
@@ -13,9 +14,9 @@ app.use(bodyParser())
 // 配置 bodyParser
 app.use(bodyParser({
   enableTypes: ['json', 'form', 'text'],
-  jsonLimit: '30mb',  
-  formLimit: '30mb',  
-  textLimit: '30mb',  
+  jsonLimit: '30mb',  // JSON 数据大小限制
+  formLimit: '30mb',  // form 数据大小限制
+  textLimit: '30mb',  // text 数据大小限制
 }))
 
 // 添加 CORS 中间件
@@ -25,6 +26,7 @@ app.use(async (ctx, next) => {
   ctx.set('Access-Control-Allow-Methods', 'POST, GET, PUT, DELETE, OPTIONS');
   ctx.set('Access-Control-Max-Age', '3600');
   
+  // 处理 OPTIONS 请求
   if (ctx.method === 'OPTIONS') {
     ctx.status = 204;
     return;
@@ -51,6 +53,7 @@ app.use(async (ctx, next) => {
 app.use(async (ctx, next) => {
   try {
     await next()
+    // 只有当没有任何路由处理请求时才设置 404
     if (ctx.status === 404 && !ctx.body) {
       ctx.status = 404
       ctx.body = {
@@ -84,6 +87,7 @@ app.use(async (ctx, next) => {
 const makeRequest = async (session_id, requestModel, messages) => {
   console.log('开始请求:', { session_id: '***', model: requestModel })
   try {
+    // 设置请求头
     const myHeaders = new Headers()
     myHeaders.append("Cookie", `session_id=${session_id}`)
     myHeaders.append("User-Agent", "Apifox/1.0.0 (https://apifox.com)");
@@ -92,7 +96,8 @@ const makeRequest = async (session_id, requestModel, messages) => {
     myHeaders.append("Host", "www.genspark.ai")
     myHeaders.append("Connection", "keep-alive")
 
-    const body = JSON.stringify({
+    // 设置请求体
+    var body = JSON.stringify({
       "type": "COPILOT_MOA_CHAT",
       "current_query_string": "type=COPILOT_MOA_CHAT",
       "messages": messages,
@@ -119,91 +124,14 @@ const makeRequest = async (session_id, requestModel, messages) => {
       throw new Error(`HTTP error! status: ${response.status}`)
     }
     
-    // 验证响应是否有效
-    if (!response.body) {
-      throw new Error('Invalid response: body is missing')
-    }
-
     return response
   } catch (error) {
     console.error('请求出错:', error)
-    // 添加重试逻辑
-    if (error.message.includes('HTTP error! status: 500')) {
-      console.log('尝试重新请求...')
-      await new Promise(resolve => setTimeout(resolve, 1000)) // 等待1秒后重试
-      return makeRequest(session_id, requestModel, messages)
-    }
     throw error
   }
 }
 
-// 用于存储未完成的数据块
-let dataBuffer = '';
-
-const parseStreamData = (data) => {
-  try {
-    if (!data) return null
-    
-    // 将新数据添加到缓冲区
-    dataBuffer += data;
-    
-    // 查找完整的JSON对象
-    const matches = dataBuffer.match(/data: ({[^}]+})/g);
-    if (!matches) return null;
-    
-    // 处理找到的每个完整JSON对象
-    for (const match of matches) {
-      try {
-        const cleanData = match.replace("data: ", '').trim();
-        if (cleanData === '[DONE]') return null;
-        
-        // 尝试解析JSON
-        const parsed = JSON.parse(cleanData);
-        
-        // 从缓冲区移除已处理的数据
-        dataBuffer = dataBuffer.slice(dataBuffer.indexOf(match) + match.length);
-        
-        // 返回解析后的对象
-        return parsed;
-      } catch (parseError) {
-        // 如果解析失败，尝试提取字段
-        const messageIdMatch = cleanData.match(/"message_id":\s*"([^"]+)"/);
-        const fieldNameMatch = cleanData.match(/"field_name":\s*"([^"]+)"/);
-        const fieldValueMatch = cleanData.match(/"field_value":\s*"([^]*?)(?:(?<!\\)",|$)/);
-        
-        if (messageIdMatch && fieldNameMatch) {
-          const fieldValue = fieldValueMatch ? fieldValueMatch[1] : '';
-          return {
-            message_id: messageIdMatch[1],
-            field_name: fieldNameMatch[1],
-            field_value: fieldValue,
-            type: 'text'
-          };
-        }
-      }
-    }
-    
-    // 如果缓冲区过大，清理它
-    if (dataBuffer.length > 10000) {
-      console.warn('缓冲区过大，正在清理...');
-      dataBuffer = dataBuffer.slice(-5000);
-    }
-    
-    return {
-      field_name: 'content',
-      field_value: '',
-      type: 'text'
-    };
-  } catch (error) {
-    console.error('解析数据出错:', error, '原始数据:', data);
-    return {
-      field_name: 'content',
-      field_value: '',
-      type: 'text'
-    };
-  }
-}
-
+// 创建处理函数
 const handleChatCompletions = async (ctx) => {
   const { messages, stream = false, model = 'claude-3-5-sonnet' } = ctx.request.body
   const session_id = ctx.get('Authorization')?.replace('Bearer ', '')
@@ -223,6 +151,24 @@ const handleChatCompletions = async (ctx) => {
 
   try {
     const response = await makeRequest(session_id, model, messages)
+    
+    if (!response.body) {
+      throw new Error('Response body is null')
+    }
+
+    if (stream == "true" || stream == true) {
+      ctx.status = 200
+      ctx.set({
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive',
+      })
+    } else {
+      ctx.status = 200
+      ctx.set({
+        'Content-Type': 'application/json',
+      })
+    }
 
     const messageId = crypto.randomUUID()
     const reader = response.body.getReader()
@@ -240,14 +186,6 @@ const handleChatCompletions = async (ctx) => {
     }
 
     if (stream == "true" || stream == true) {
-      ctx.status = 200
-      ctx.set({
-        'Content-Type': 'text/event-stream',
-        'Cache-Control': 'no-cache',
-        'Connection': 'keep-alive',
-      })
-      
-      // 发送初始消息
       ctx.res.write(`data: ${JSON.stringify({
         "id": `chatcmpl-${messageId}`,
         "choices": [
@@ -263,11 +201,6 @@ const handleChatCompletions = async (ctx) => {
         "model": model,
         "object": "chat.completion.chunk"
       })}\n\n`)
-    } else {
-      ctx.status = 200
-      ctx.set({
-        'Content-Type': 'application/json',
-      })
     }
 
     try {
@@ -280,61 +213,49 @@ const handleChatCompletions = async (ctx) => {
           break
         }
 
-        const text = new TextDecoder().decode(value)
-        const textContent = [...text.matchAll(/data:.*?(?=(\n\ndata:|$))/gs)]
+        if (stream == "true" || stream == true) {
+          const text = new TextDecoder().decode(value)
+          const textContent = [...text.matchAll(/data:.*"}/g)]
 
-        for (const item of textContent) {
-          if (!item[0]) continue
-          
-          const content = parseStreamData(item[0])
-          if (!content) continue
+          textContent.forEach(item => {
+            if (!item[0]) return
+            const content = JSON.parse(item[0].replace("data: ", ''))
+            if (!content || !content.delta) return
 
-          if (stream == "true" || stream == true) {
-            // 处理流式响应
-            const delta = content.delta || 
-                         (content.field_name === 'content' ? content.field_value : null)
-            
-            if (delta) {
-              try {
-                const chunk = {
-                  "id": `chatcmpl-${messageId}`,
-                  "choices": [
-                    {
-                      "index": 0,
-                      "delta": {
-                        "content": delta
-                      }
-                    }
-                  ],
-                  "created": Math.floor(Date.now() / 1000),
-                  "model": model,
-                  "object": "chat.completion.chunk"
-                };
-                
-                ctx.res.write(`data: ${JSON.stringify(chunk)}\n\n`)
-              } catch (e) {
-                console.error('写入流数据失败:', e, '数据:', delta)
-              }
-            }
-          } else {
-            // 处理非流式响应
-            if (content.field_value && 
-                content.field_name !== 'session_state.answer_is_finished' && 
-                content.field_name !== 'content' && 
-                content.field_name !== 'session_state' && 
-                !content.delta && 
-                content.type !== 'project_field') {
-              resBody.choices.push({
-                index: 0,
-                message: {
-                  role: 'assistant',
-                  content: content.field_value,
-                },
-                finish_reason: 'stop',
-              })
-              resBody.usage.total_tokens = content.field_value.length
-            }
-          }
+            ctx.res.write(`data: ${JSON.stringify({
+              "id": `chatcmpl-${messageId}`,
+              "choices": [
+                {
+                  "index": 0,
+                  "delta": {
+                    "content": content.delta
+                  }
+                }
+              ],
+              "created": Math.floor(Date.now() / 1000),
+              "model": model,
+              "object": "chat.completion.chunk"
+            })}\n\n`)
+          })
+        } else {
+          const text = new TextDecoder().decode(value)
+          const textContent = [...text.matchAll(/data:.*"}/g)]
+
+          textContent.forEach(item => {
+            if (!item[0]) return
+            const content = JSON.parse(item[0].replace("data: ", ''))
+            if (!content || !content.field_value || content.field_name == 'session_state.answer_is_finished' || content.field_name == 'content' || content.field_name == 'session_state' || content.delta || content.type == 'project_field') return
+
+            resBody.choices.push({
+              index: 0,
+              message: {
+                role: 'assistant',
+                content: content.field_value,
+              },
+              finish_reason: 'stop',
+            })
+            resBody.usage.total_tokens = content.field_value.length
+          })
         }
       }
 
@@ -405,12 +326,13 @@ const handleModels = async (ctx) => {
   }
 }
 
-// 注册路由
+// 注册路由 - 同时支持 /v1 和 /hf/v1 路径
 router.post('/v1/chat/completions', handleChatCompletions)
 router.post('/hf/v1/chat/completions', handleChatCompletions)
 router.get('/v1/models', handleModels)
 router.get('/hf/v1/models', handleModels)
 
+// 添加根路由处理器
 router.get('/', async (ctx) => {
   ctx.body = {
     status: 'ok',
@@ -418,15 +340,17 @@ router.get('/', async (ctx) => {
     version: '1.0.0',
     endpoints: [
       '/v1/chat/completions',
-      '/hf/v1/chat/completions', 
+      '/hf/v1/chat/completions',
       '/v1/models',
       '/hf/v1/models'
     ]
   }
 })
 
+// 注册路由中间件
 app.use(router.routes()).use(router.allowedMethods())
 
+// 启动服务器
 const PORT = process.env.PORT || 3000
 app.listen(PORT, '0.0.0.0', () => {
   console.log('='.repeat(50))