Update server.js

server.js

@@ -1,48 +1,53 @@
-/**
- * Helix ↔︎ OpenAI 代理（全路径 + 流式过滤）
- * 2025‑04‑19
- */
-addEventListener('fetch', e => e.respondWith(router(e.request)));
-
-async function router(req) {
-  const url = new URL(req.url);
-  const p   = url.pathname.replace(/\/+$/, '');
-  const m   = req.method;
-
-  if (m === 'OPTIONS') return cors(new Response(null, { status: 204 }));
-
-  if ((p === '/models' || p === '/v1/models') && m === 'GET')
-    return cors(modelsList());
-
-  if (
-    (p === '/chat/completions' || p === '/v1/chat/completions') &&
-    m === 'POST'
-  )
-    return cors(await chatProxy(req));
-
-  return cors(json({ error: 'Not Found', path: p }, 404));
-}
-
-/* ---------- 模型列表 ---------- */
-function modelsList() {
-  return json({
+import express from 'express';
+import cors from 'cors';
+import fetch from 'node-fetch';
+
+const app = express();
+
+// CORS
+app.use(cors({
+  origin: '*',
+  methods: ['GET', 'POST', 'OPTIONS'],
+  allowedHeaders: ['Content-Type', 'Authorization']
+}));
+app.use(express.json());
+app.options('*', (req, res) => res.sendStatus(204));
+
+// Список моделей
+app.get(['/models', '/v1/models'], (req, res) => {
+  res.json({
     object: 'list',
     data: [
-      { id: 'gpt-4o',        object: 'model', created: 0, owned_by: 'helix' },
+      // OpenAI — GPT‑4.1 / 4.5
+      { id: 'gpt-4.1',                    object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4.1-2025-04-14',         object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4.1-mini',               object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4.1-mini-2025-04-14',    object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4.1-nano',               object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4.1-nano-2025-04-14',    object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4.5-preview',            object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4.5-preview-2025-02-27', object: 'model', created: 0, owned_by: 'helix' },
+
+      // OpenAI — GPT‑4o
+      { id: 'gpt-4o',                           object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-2024-05-13',                object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-2024-08-06',                object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-2024-11-20',                object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-mini',                      object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-mini-2024-07-18',           object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-search-preview',            object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-search-preview-2025-03-11', object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-mini-search-preview',       object: 'model', created: 0, owned_by: 'helix' },
+      { id: 'gpt-4o-mini-search-preview-2025-03-11', object: 'model', created: 0, owned_by: 'helix' },
+
+      // Helix — GPT‑3.5 Turbo
       { id: 'gpt-3.5-turbo', object: 'model', created: 0, owned_by: 'helix' }
     ]
   });
-}
-
-/* ---------- 聊天 ---------- */
-async function chatProxy(req) {
-  let body;
-  try {
-    body = await req.json();
-  } catch {
-    return json({ error: 'Bad JSON' }, 400);
-  }
+});
 
+// Прокси для чата
+app.post(['/chat/completions', '/v1/chat/completions'], async (req, res) => {
   const {
     model,
     messages = [],
@@ -52,10 +57,11 @@ async function chatProxy(req) {
     presence_penalty,
     frequency_penalty,
     ...rest
-  } = body;
+  } = req.body;
 
+  // Заменили префиксы "用户：" и "AI：" на английские
   const historyText = messages
-    .map(m => (m.role === 'user' ? 'user：' : 'AI：') + m.content)
+    .map(m => (m.role === 'user' ? 'User: ' : 'Assistant: ') + m.content)
     .join('\n');
 
   const helixPayload = {
@@ -64,7 +70,10 @@ async function chatProxy(req) {
     provider: getProvider(model),
     model,
     messages: [
-      { role: 'user', content: { content_type: 'text', parts: [historyText] } }
+      {
+        role: 'user',
+        content: { content_type: 'text', parts: [historyText] }
+      }
     ],
     temperature,
     top_p,
@@ -73,22 +82,20 @@ async function chatProxy(req) {
     ...rest
   };
 
-  const helixRes = await fetch(
-    'https://app.tryhelix.ai/api/v1/sessions/chat',
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: req.headers.get('Authorization') || ''
-      },
-      body: JSON.stringify(helixPayload)
-    }
-  );
+  // Отправляем в Helix
+  const helixRes = await fetch('https://app.tryhelix.ai/api/v1/sessions/chat', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: req.header('authorization') || ''
+    },
+    body: JSON.stringify(helixPayload)
+  });
 
   if (!stream) {
-    const data   = await helixRes.json();
-    const reply  = data?.choices?.[0]?.message?.content ?? '';
-    const openai = {
+    const data = await helixRes.json();
+    const reply = data?.choices?.[0]?.message?.content ?? '';
+    return res.status(helixRes.status).json({
       id: `chatcmpl-proxy-${data.id ?? Date.now()}`,
       object: 'chat.completion',
       created: Math.floor(Date.now() / 1000),
@@ -100,66 +107,22 @@ async function chatProxy(req) {
           finish_reason: 'stop'
         }
       ]
-    };
-    return json(openai, helixRes.status);
+    });
   }
 
-  /* ---- 流式过滤 ---- */
-  const filteredStream = helixRes.body
-    .pipeThrough(new TextDecoderStream())
-    .pipeThrough(sseLineSplitter())
-    .pipeThrough(new TransformStream({
-      transform(line, controller) {
-        if (!line.startsWith('data:')) { controller.enqueue(line); return; }
-        const payload = line.slice(5).trim();
-        if (payload === '[DONE]') { controller.enqueue(line); return; }
-        try {
-          const obj = JSON.parse(payload);
-          if (obj.choices === null || (Array.isArray(obj.choices) && obj.choices.length === 0))
-            return;
-        } catch { /* ignore */ }
-        controller.enqueue(line);
-      }
-    }))
-    .pipeThrough(new TextEncoderStream());
-
-  return new Response(filteredStream, {
-    status: helixRes.status,
-    headers: { 'Content-Type': 'text/event-stream' }
-  });
-}
+  // Если нужен стрим — прокидываем SSE напрямую
+  res.status(helixRes.status);
+  res.set('Content-Type', 'text/event-stream');
+  helixRes.body.pipe(res);
+});
 
-/* ---------- 工具 ---------- */
 function getProvider(m) {
   if (/^gpt-[34]|^gpt-3\.5/.test(m)) return 'openai';
   if (/^(llama|phi|aya|gemma|deepseek|qwen)/.test(m)) return 'helix';
   return 'togetherai';
 }
-const json = (o, s = 200) =>
-  new Response(JSON.stringify(o), {
-    status: s,
-    headers: { 'Content-Type': 'application/json' }
-  });
-
-function cors(res) {
-  const h = new Headers(res.headers);
-  h.set('Access-Control-Allow-Origin', '*');
-  h.set('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
-  h.set('Access-Control-Allow-Headers', 'Content-Type, Authorization');
-  return new Response(res.body, { ...res, headers: h });
-}
 
-function sseLineSplitter() {
-  let buf = '';
-  return new TransformStream({
-    transform(chunk, controller) {
-      buf += chunk;
-      const lines = buf.split('\n');
-      buf = lines.pop();
-      for (const l of lines) controller.enqueue(l + '\n');
-    },
-    flush(controller) {
-      if (buf) controller.enqueue(buf);
-    }
-  });
-}
+const PORT = process.env.PORT || 7860;
+app.listen(PORT, () => {
+  console.log(`🚀 Server listening on port ${PORT}`);
+});