Upload 2 files

src/index.js

@@ -19,22 +19,6 @@ app.use(bodyParser({
   textLimit: '30mb',  // text 数据大小限制
 }))
 
-// 添加重定向中间件 - 移到路由注册之前
-app.use(async (ctx, next) => {
-  console.log('收到请求:', ctx.method, ctx.path, ctx.query)
-  if (ctx.path.startsWith('/v1/')) {
-    const newPath = '/hf' + ctx.path
-    console.log('重定向:', ctx.path, '->', newPath)
-    ctx.status = 307 // 临时重定向，保持 HTTP 方法
-    ctx.redirect(newPath)
-    return
-  }
-  await next()
-})
-
-// 注册路由
-app.use(router.routes()).use(router.allowedMethods())
-
 const makeRequest = async (session_id, requestModel, messages) => {
   console.log('开始请求 genspark.ai:', { session_id, requestModel })
   try {
@@ -93,8 +77,8 @@ const makeRequest = async (session_id, requestModel, messages) => {
   }
 }
 
-
-router.post('/v1/chat/completions', async (ctx) => {
+// 创建处理函数
+const handleChatCompletions = async (ctx) => {
   const { messages, stream = false, model = 'claude-3-5-sonnet' } = ctx.request.body
   const session_id = ctx.get('Authorization')?.replace('Bearer ', '')
 
@@ -150,30 +134,20 @@ router.post('/v1/chat/completions', async (ctx) => {
         const { done, value } = await reader.read()
         if (done) {
           if (stream == "true" || stream == true) {
-            // 发送完成标记
             ctx.res.write('data: [DONE]\n\n')
           }
           break
         }
 
         if (stream) {
-
           const text = new TextDecoder().decode(value)
           const textContent = [...text.matchAll(/data:.*"}/g)]
 
           textContent.forEach(item => {
-            if (!item[0]) {
-              return
-            }
-
+            if (!item[0]) return
             const content = JSON.parse(item[0].replace("data: ", ''))
-            if (!content || !content.delta) {
-              return
-            }
+            if (!content || !content.delta) return
 
-            // console.log(content.delta)
-
-            // 发送增量内容
             ctx.res.write(`data: ${JSON.stringify({
               "id": `chatcmpl-${messageId}`,
               "choices": [
@@ -193,18 +167,10 @@ router.post('/v1/chat/completions', async (ctx) => {
           const text = new TextDecoder().decode(value)
           const textContent = [...text.matchAll(/data:.*"}/g)]
 
-
           textContent.forEach(item => {
-            if (!item[0]) {
-              return
-            }
-
+            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
-            }
-
-            // console.log(content)
+            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 = {
               id: `chatcmpl-${messageId}`,
@@ -227,14 +193,11 @@ router.post('/v1/chat/completions', async (ctx) => {
                 total_tokens: content.field_value.length,
               },
             }
-
           })
         }
-
       }
 
       if (stream == "false" || stream == false) {
-        // console.log(resBody)
         ctx.body = resBody
       } else {
         ctx.res.end()
@@ -244,7 +207,6 @@ router.post('/v1/chat/completions', async (ctx) => {
       console.error('流式响应出错:', error)
       ctx.res.end()
     }
-
   } catch (error) {
     console.error('请求处理出错:', error)
     ctx.status = error.status || 500
@@ -253,162 +215,10 @@ router.post('/v1/chat/completions', async (ctx) => {
       details: error.toString()
     }
   }
-})
-
-// hf/v1 路由（复制 v1 路由的处理逻辑）
-router.post('/hf/v1/chat/completions', async (ctx) => {
-  const { messages, stream = false, model = 'claude-3-5-sonnet' } = ctx.request.body
-  const session_id = ctx.get('Authorization')?.replace('Bearer ', '')
-
-  if (!session_id) {
-    ctx.status = 401
-    ctx.body = { error: '未提供有效的 session_id' }
-    return
-  }
-
-  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.set({
-        'Content-Type': 'text/event-stream',
-        'Cache-Control': 'no-cache',
-        'Connection': 'keep-alive',
-      })
-    } else {
-      ctx.set({
-        'Content-Type': 'application/json',
-      })
-    }
-
-    const messageId = crypto.randomUUID()
-    const reader = response.body.getReader()
-    if (stream == "true" || stream == true) {
-      ctx.res.write(`data: ${JSON.stringify({
-        "id": `chatcmpl-${messageId}`,
-        "choices": [
-          {
-            "index": 0,
-            "delta": {
-              "content": "",
-              "role": "assistant"
-            }
-          }
-        ],
-        "created": Math.floor(Date.now() / 1000),
-        "model": models[`${model}`],
-        "object": "chat.completion.chunk"
-      })}\n\n`)
-    }
-
-    try {
-      let resBody = {}
-
-      while (true) {
-        const { done, value } = await reader.read()
-        if (done) {
-          if (stream == "true" || stream == true) {
-            // 发送完成标记
-            ctx.res.write('data: [DONE]\n\n')
-          }
-          break
-        }
-
-        if (stream) {
-          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": models[`${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 = {
-              id: `chatcmpl-${messageId}`,
-              object: 'chat.completion',
-              created: Math.floor(Date.now() / 1000),
-              model,
-              choices: [
-                {
-                  index: 0,
-                  message: {
-                    role: 'assistant',
-                    content: content.field_value,
-                  },
-                  finish_reason: 'stop',
-                },
-              ],
-              usage: {
-                prompt_tokens: 0,
-                completion_tokens: 0,
-                total_tokens: content.field_value.length,
-              },
-            }
-          })
-        }
-      }
-
-      if (stream == "false" || stream == false) {
-        ctx.body = resBody
-      } else {
-        ctx.res.end()
-      }
-      return
-    } catch (error) {
-      console.error('流式响应出错:', error)
-      ctx.res.end()
-    }
-  } catch (error) {
-    console.error('请求处理出错:', error)
-    ctx.status = error.status || 500
-    ctx.body = { 
-      error: error.message || '请求处理失败',
-      details: error.toString()
-    }
-  }
-})
+}
 
-// 获取models的v1路由
-router.get('/v1/models', async (ctx) => {
+// 创建获取模型列表的处理函数
+const handleModels = async (ctx) => {
   ctx.body = {
     object: "list",
     data: Object.keys(models).map(model => ({
@@ -418,20 +228,16 @@ router.get('/v1/models', async (ctx) => {
       owned_by: "genspark"
     }))
   }
-})
+}
 
-// 获取models的hf/v1路由
-router.get('/hf/v1/models', async (ctx) => {
-  ctx.body = {
-    object: "list",
-    data: Object.keys(models).map(model => ({
-      id: model,
-      object: "model",
-      created: 1706745938,
-      owned_by: "genspark"
-    }))
-  }
-})
+// 注册路由 - 同时支持 /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)
+
+// 注册路由中间件
+app.use(router.routes()).use(router.allowedMethods())
 
 // 错误处理中间件
 app.use(async (ctx, next) => {