Update hf.js

hf.js

@@ -2,15 +2,39 @@ const express = require('express');
 const morgan = require('morgan');
 const { createProxyMiddleware } = require('http-proxy-middleware');
 const axios = require('axios');
-const fs = require('fs');
 const url = require('url');
 const app = express();
 
+// 启用日志
 app.use(morgan('dev'));
 
-// 全局代理池
-let proxyPool = process.env.PROXY ? process.env.PROXY.split(',').map(p => p.trim()) : [];
-console.log('Initial proxy pool:', proxyPool);
+// 环境变量配置
+const PORT = process.env.HF_PORT || 7860;
+const TARGET_URL = process.env.TARGET_URL || 'http://localhost:3010';
+const API_PATH = process.env.API_PATH || '/v1';
+const TIMEOUT = parseInt(process.env.TIMEOUT) || 30000;
+
+console.log(`Service configuration:
+- Port: ${PORT}
+- Target URL: ${TARGET_URL}
+- API Path: ${API_PATH}
+- Timeout: ${TIMEOUT}ms`);
+
+// 解析代理设置
+let proxyPool = [];
+if (process.env.PROXY) {
+  proxyPool = process.env.PROXY.split(',').map(p => p.trim()).filter(p => p);
+  console.log(`Loaded ${proxyPool.length} proxies from environment`);
+  
+  if (proxyPool.length > 0) {
+    console.log('Proxy pool initialized:');
+    proxyPool.forEach((proxy, index) => {
+      // 隐藏敏感信息的日志
+      const maskedProxy = proxy.replace(/(https?:\/\/)([^:]+):([^@]+)@/, '$1$2:****@');
+      console.log(`  [${index + 1}] ${maskedProxy}`);
+    });
+  }
+}
 
 // 从代理池中随机选择一个代理
 function getRandomProxy() {
@@ -29,46 +53,6 @@ function getRandomProxy() {
   };
 }
 
-// 配置 axios 的代理
-function configureAxiosProxy() {
-  const proxy = getRandomProxy();
-  if (proxy) {
-    axios.defaults.proxy = proxy;
-    console.log(`Axios using proxy: ${proxy.host}:${proxy.port}`);
-  } else {
-    delete axios.defaults.proxy;
-    console.log('No proxy available for axios');
-  }
-}
-
-// 从外部 API 更新代理池
-async function updateProxyPool() {
-  const proxyApiUrl = process.env.PROXY_API_URL || 'http://example.com/api/proxies';
-  try {
-    const response = await axios.get(proxyApiUrl);
-    // 假设 API 返回格式为 { proxies: ["http://user:pass@host:port", ...] }
-    const newProxies = response.data.proxies || [];
-    if (newProxies.length > 0) {
-      proxyPool = newProxies;
-      console.log('Proxy pool updated:', proxyPool);
-      configureAxiosProxy(); // 更新 axios 代理
-    } else {
-      console.warn('No proxies received from API');
-    }
-  } catch (error) {
-    console.error('Failed to update proxy pool:', error.message);
-  }
-}
-
-// 定期更新代理池
-const updateInterval = parseInt(process.env.PROXY_UPDATE_INTERVAL) || 300; // 默认 5 分钟
-if (updateInterval > 0) {
-  setInterval(updateProxyPool, updateInterval * 1000);
-  console.log(`Proxy pool will update every ${updateInterval} seconds`);
-  // 启动时立即更新一次
-  updateProxyPool();
-}
-
 // 模型列表 API
 app.get('/hf/v1/models', (req, res) => {
   const models = {
@@ -208,12 +192,16 @@ app.get('/hf/v1/models', (req, res) => {
 // 代理转发，使用动态代理池
 app.use('/hf/v1/chat/completions', (req, res, next) => {
   const proxy = getRandomProxy();
+  const targetEndpoint = `${TARGET_URL}${API_PATH}/chat/completions`;
+  
+  console.log(`Forwarding request to: ${targetEndpoint}`);
+  
   const middleware = createProxyMiddleware({
-    target: 'http://localhost:3010/v1/chat/completions', // 可替换为实际目标服务
+    target: targetEndpoint,
     changeOrigin: true,
     proxy: proxy ? proxy : undefined,
-    timeout: 30000, // 超时 30 秒
-    proxyTimeout: 30000, // 代理超时 30 秒
+    timeout: TIMEOUT,
+    proxyTimeout: TIMEOUT,
     onProxyReq: (proxyReq, req, res) => {
       if (req.body) {
         const bodyData = JSON.stringify(req.body);
@@ -225,14 +213,26 @@ app.use('/hf/v1/chat/completions', (req, res, next) => {
     },
     onError: (err, req, res) => {
       console.error('Proxy error:', err);
-      res.status(500).send('Proxy error occurred');
+      res.status(500).json({
+        error: {
+          message: 'Proxy error occurred',
+          type: 'proxy_error',
+          details: process.env.NODE_ENV === 'development' ? err.message : undefined
+        }
+      });
+    },
+    onProxyRes: (proxyRes, req, res) => {
+      console.log(`Proxy response status: ${proxyRes.statusCode}`);
     }
   });
+  
   if (proxy) {
-    console.log(`Request proxied via ${proxy.host}:${proxy.port}`);
+    const maskedProxy = `${proxy.host}:${proxy.port}` + (proxy.auth ? ' (with auth)' : '');
+    console.log(`Using proxy: ${maskedProxy}`);
   } else {
-    console.log('No proxy available, direct connection');
+    console.log('Direct connection (no proxy)');
   }
+  
   middleware(req, res, next);
 });
 
@@ -296,6 +296,16 @@ app.get('/', (req, res) => {
           color: var(--primary-color);
           font-weight: 500;
         }
+        .service-status {
+          background: #dcfce7;
+          border: 1px solid #86efac;
+          color: #166534;
+          padding: 8px 12px;
+          border-radius: 6px;
+          font-size: 0.95em;
+          display: inline-block;
+          margin: 15px 0;
+        }
         .models { 
           background: var(--card-bg);
           padding: 25px;
@@ -336,6 +346,19 @@ app.get('/', (req, res) => {
           background: #f1f5f9;
           border-radius: 4px;
         }
+        .details {
+          margin-top: 20px;
+          background: #f8fafc;
+          padding: 15px;
+          border-radius: 8px;
+          border: 1px solid #e5e7eb;
+        }
+        .details pre {
+          background: #f1f5f9;
+          padding: 10px;
+          border-radius: 6px;
+          overflow-x: auto;
+        }
         @media (max-width: 768px) {
           body {
             padding: 10px;
@@ -351,31 +374,48 @@ app.get('/', (req, res) => {
         <div class="header">
           <h1>Cursor To OpenAI Server</h1>
           <p>高性能 AI 模型代理服务</p>
+          <div class="service-status">服务正在运行</div>
         </div>
+        
         <div class="info"> 
           <h2>配置信息</h2>
           <div class="info-item">
-            <div class="info-label">聊天来源</div>
-            <div class="info-value">自定义(兼容 OpenAI)</div>
+            <div class="info-label">服务环境</div>
+            <div class="info-value">环境变量配置模式</div>
           </div>
           <div class="info-item">
             <div class="info-label">自定义端点(基本URL)</div>
             <div class="info-value" id="endpoint-url"></div>
           </div>
           <div class="info-item">
-            <div class="info-label">自定义API密钥</div>
-            <div class="info-value">抓取的Cursor Cookie，格式为user_...</div>
+            <div class="info-label">目标服务</div>
+            <div class="info-value">${TARGET_URL}${API_PATH}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-label">代理状态</div>
+            <div class="info-value">${proxyPool.length > 0 ? `使用中 (${proxyPool.length}个代理)` : '未启用'}</div>
           </div>
         </div>
+        
         <div class="models">
           <h3>支持的模型列表</h3>
           <div id="model-list"></div>
         </div>
+        
+        <div class="details">
+          <h3>使用说明</h3>
+          <p>在客户端配置以下信息:</p>
+          <pre>API URL: http://{服务器地址}:${PORT}/hf/v1
+API Key: 您的API密钥</pre>
+          <p>支持兼容OpenAI格式的请求，已预配置转发到${TARGET_URL}${API_PATH}</p>
+        </div>
       </div>
+      
       <script>
         const url = new URL(window.location.href);
         const link = url.protocol + '//' + url.host + '/hf/v1';
         document.getElementById('endpoint-url').textContent = link;
+        
         fetch(link + '/models')
           .then(response => response.json())
           .then(data => {
@@ -401,11 +441,21 @@ app.get('/', (req, res) => {
   res.send(htmlContent);
 });
 
-// 启动服务前配置初始 axios 代理
-configureAxiosProxy();
+// 健康检查端点
+app.get('/health', (req, res) => {
+  res.status(200).json({
+    status: 'ok',
+    time: new Date().toISOString(),
+    proxyCount: proxyPool.length,
+    target: `${TARGET_URL}${API_PATH}`
+  });
+});
 
-const port = process.env.HF_PORT || 7860;
-app.listen(port, () => {
-  console.log(`HF Proxy server is running at PORT: ${port}`);
+// 启动服务
+app.listen(PORT, () => {
+  console.log(`HF Proxy server is running at PORT: ${PORT}`);
+  console.log(`Target service: ${TARGET_URL}${API_PATH}`);
+  console.log(`Proxy status: ${proxyPool.length > 0 ? 'Enabled' : 'Disabled'}`);
 });
 
+