Upload 2 files

src/index.js

@@ -4,7 +4,6 @@ const bodyParser = require('koa-bodyparser')
 const models = require("./models")
 const crypto = require('crypto')
 
-
 const app = new Koa()
 const router = new Router()
 
@@ -14,9 +13,9 @@ app.use(bodyParser())
 // 配置 bodyParser
 app.use(bodyParser({
   enableTypes: ['json', 'form', 'text'],
-  jsonLimit: '30mb',  // JSON 数据大小限制
-  formLimit: '30mb',  // form 数据大小限制
-  textLimit: '30mb',  // text 数据大小限制
+  jsonLimit: '30mb',  
+  formLimit: '30mb',  
+  textLimit: '30mb',  
 }))
 
 // 添加 CORS 中间件
@@ -26,7 +25,6 @@ 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;
@@ -53,7 +51,6 @@ 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 = {
@@ -87,7 +84,6 @@ 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)");
@@ -96,8 +92,7 @@ const makeRequest = async (session_id, requestModel, messages) => {
     myHeaders.append("Host", "www.genspark.ai")
     myHeaders.append("Connection", "keep-alive")
 
-    // 设置请求体
-    var body = JSON.stringify({
+    const body = JSON.stringify({
       "type": "COPILOT_MOA_CHAT",
       "current_query_string": "type=COPILOT_MOA_CHAT",
       "messages": messages,
@@ -124,14 +119,36 @@ 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
   }
 }
 
-// 创建处理函数
+const parseStreamData = (data) => {
+  try {
+    if (!data) return null
+    const cleanData = data.replace("data: ", '').trim()
+    if (!cleanData || cleanData === '[DONE]') return null
+    return JSON.parse(cleanData)
+  } catch (error) {
+    console.error('解析数据出错:', error, '原始数据:', data)
+    return null
+  }
+}
+
 const handleChatCompletions = async (ctx) => {
   const { messages, stream = false, model = 'claude-3-5-sonnet' } = ctx.request.body
   const session_id = ctx.get('Authorization')?.replace('Bearer ', '')
@@ -151,24 +168,6 @@ 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()
@@ -186,6 +185,14 @@ 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": [
@@ -201,6 +208,11 @@ const handleChatCompletions = async (ctx) => {
         "model": model,
         "object": "chat.completion.chunk"
       })}\n\n`)
+    } else {
+      ctx.status = 200
+      ctx.set({
+        'Content-Type': 'application/json',
+      })
     }
 
     try {
@@ -213,49 +225,54 @@ const handleChatCompletions = async (ctx) => {
           break
         }
 
-        if (stream == "true" || stream == true) {
-          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.delta) return
-
-            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)]
+        const text = new TextDecoder().decode(value)
+        const textContent = [...text.matchAll(/data:.*?(?=(\n\ndata:|$))/gs)]
 
-          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
+        for (const item of textContent) {
+          if (!item[0]) continue
+          
+          const content = parseStreamData(item[0])
+          if (!content) continue
 
-            resBody.choices.push({
-              index: 0,
-              message: {
-                role: 'assistant',
-                content: content.field_value,
-              },
-              finish_reason: 'stop',
-            })
-            resBody.usage.total_tokens = content.field_value.length
-          })
+          if (stream == "true" || stream == true) {
+            if (content.delta) {
+              try {
+                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`)
+              } catch (e) {
+                console.error('写入流数据失败:', e)
+              }
+            }
+          } 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
+            }
+          }
         }
       }
 
@@ -326,13 +343,12 @@ 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',
@@ -340,17 +356,15 @@ 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))