Upload 11 files

executor.js

@@ -2,79 +2,49 @@ const https = require('https');
 const http = require('http');
 const log = require('./logger');
 
-const CHERRY_STUDIO_USER_AGENT = 'cherry studio/1.0(secure client)';
-
-// 全局 HTTP Agent 配置 - 支持高并发连接复用
-const httpsAgent = new https.Agent({
-  keepAlive: true,        // 启用连接复用
-  maxSockets: 600,        // 每个主机最大连接数（略高于线程数）
-  maxFreeSockets: 100,    // 空闲连接池大小
-  keepAliveMsecs: 30000,  // keepAlive 探测间隔
-  timeout: 10000,         // 连接建立超时
-});
-
-const httpAgent = new http.Agent({
-  keepAlive: true,
-  maxSockets: 600,
-  maxFreeSockets: 100,
-  keepAliveMsecs: 30000,
-  timeout: 10000,
-});
-
-// 最大重试次数
-const MAX_RETRIES = 3;
-
-// 停滞自动暂停配置：连续多久没有成功就自动暂停（毫秒）
-// 默认 1 小时 = 3600000ms，可通过环境变量 STALL_TIMEOUT_MS 配置
-const STALL_TIMEOUT_MS = Number(process.env.STALL_TIMEOUT_MS) || 3600000;
-
-// 判断是否是可重试的网络错误（TLS 握手失败、连接重置等）
-function isRetryableError(err) {
-  if (!err) return false;
-  const msg = err.message || '';
-  const code = err.code || '';
-  
-  // TLS 握手错误
-  if (msg.includes('TLS') || msg.includes('socket disconnected before secure')) return true;
-  
-  // 连接相关错误
-  if (['ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'ENOTFOUND', 'EHOSTUNREACH'].includes(code)) return true;
-  if (msg.includes('ECONNRESET') || msg.includes('ETIMEDOUT') || msg.includes('socket hang up')) return true;
-  
-  return false;
+const USER_AGENTS = [
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.1 Safari/605.1.15',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:132.0) Gecko/20100101 Firefox/132.0',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:132.0) Gecko/20100101 Firefox/132.0',
+  'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Edg/131.0.0.0'
+];
+
+const ACCEPT_LANGUAGES = [
+  'en-US,en;q=0.9',
+  'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7',
+  'zh-CN,zh;q=0.9,en;q=0.8',
+  'en-GB,en;q=0.9,en-US;q=0.8',
+  'zh-TW,zh;q=0.9,en-US;q=0.8,en;q=0.7'
+];
+
+function getRandomUserAgent() {
+  return USER_AGENTS[Math.floor(Math.random() * USER_AGENTS.length)];
 }
 
-// Max length of content to store in thread logs (for frontend display)
-const LOG_CONTENT_MAX_LENGTH = 20;
-
-// Multiplier for marker length step calculation
-const RATIO_STEP_MULTIPLIER = 100;
-
-// Token rotation counter
-const tokenCounters = new Map();
+function getRandomAcceptLanguage() {
+  return ACCEPT_LANGUAGES[Math.floor(Math.random() * ACCEPT_LANGUAGES.length)];
+}
 
-// Get next token from rotation, returns both token and index
-function getNextToken(config) {
-  // Split tokens by comma and trim whitespace
-  const tokens = String(config.token || '').split(',').map(t => t.trim()).filter(Boolean);
-  
-  // If only one token, return it directly
-  if (tokens.length <= 1) {
-    return { token: tokens[0] || config.token, index: 0, total: tokens.length || 1 };
-  }
-  
-  // Get current counter for this config (using a hash of token string as key)
-  const tokenKey = tokens.join(',');
-  let counter = tokenCounters.get(tokenKey) || 0;
-  
-  // Get current token
-  const index = counter % tokens.length;
-  const token = tokens[index];
-  
-  // Increment counter
-  tokenCounters.set(tokenKey, counter + 1);
-  
-  return { token, index, total: tokens.length };
+function buildDisguiseHeaders() {
+  return {
+    'User-Agent': getRandomUserAgent(),
+    'Accept': 'application/json, text/event-stream, */*',
+    'Accept-Language': getRandomAcceptLanguage(),
+    'Accept-Encoding': 'gzip, deflate, br',
+    'Cache-Control': 'no-cache',
+    'Pragma': 'no-cache',
+    'Sec-Ch-Ua': '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
+    'Sec-Ch-Ua-Mobile': '?0',
+    'Sec-Ch-Ua-Platform': '"Windows"',
+    'Sec-Fetch-Dest': 'empty',
+    'Sec-Fetch-Mode': 'cors',
+    'Sec-Fetch-Site': 'cross-site',
+    'Connection': 'keep-alive'
+  };
 }
 
 function buildUrl(baseUrl, endpoint) {
@@ -135,16 +105,14 @@ function makeRequest(url, options, body, timeout = 60000) {
     const isHttps = urlObj.protocol === 'https:';
     const lib = isHttps ? https : http;
     
-    const mergedHeaders = { 'User-Agent': CHERRY_STUDIO_USER_AGENT, ...(options.headers || {}) };
-    
+    const disguiseHeaders = buildDisguiseHeaders();
     const reqOptions = {
       hostname: urlObj.hostname,
       port: urlObj.port || (isHttps ? 443 : 80),
       path: urlObj.pathname + urlObj.search,
       method: options.method || 'GET',
-      headers: mergedHeaders,
-      timeout,
-      agent: isHttps ? httpsAgent : httpAgent
+      headers: { ...disguiseHeaders, ...options.headers },
+      timeout
     };
 
     const req = lib.request(reqOptions, (res) => {
@@ -167,14 +135,9 @@ async function fetchModels(baseUrl, token) {
   try {
     log.debug('Fetching models from:', baseUrl);
     const url = buildUrl(baseUrl, '/models');
-    
-    // Handle token rotation for model fetching
-    const tokens = String(token || '').split(',').map(t => t.trim()).filter(Boolean);
-    const useToken = tokens.length > 0 ? tokens[0] : token;
-    
     const resp = await makeRequest(url, {
       method: 'GET',
-      headers: { 'Authorization': 'Bearer ' + useToken }
+      headers: { 'Authorization': 'Bearer ' + token }
     });
     const data = JSON.parse(resp.body);
     if (resp.status !== 200) {
@@ -192,18 +155,9 @@ async function fetchModels(baseUrl, token) {
   }
 }
 
-async function requestOnce(config, signal, threadLog) {
+async function requestOnce(config, signal) {
   const { prompt, tag, marker } = buildUserPrompt(config.usr, config.randOn, config.markerLen);
   
-  // Get next token from rotation
-  const { token, index, total } = getNextToken(config);
-  
-  // Record token index in thread log
-  if (threadLog) {
-    threadLog.tokenIndex = index;
-    threadLog.tokenTotal = total;
-  }
-  
   const body = {
     model: config.model,
     messages: [
@@ -219,7 +173,7 @@ async function requestOnce(config, signal, threadLog) {
   const resp = await makeRequest(url, {
     method: 'POST',
     headers: {
-      'Authorization': 'Bearer ' + token,
+      'Authorization': 'Bearer ' + config.token,
       'Content-Type': 'application/json'
     }
   }, JSON.stringify(body), config.timeout);
@@ -248,13 +202,12 @@ async function requestOnce(config, signal, threadLog) {
   }
 
   const content = data?.choices?.[0]?.message?.content || '';
-  const reasoning = data?.choices?.[0]?.message?.reasoning_content || '';
-  const usage = usageWithFallback(data?.usage, prompt, config.sys, content + reasoning);
+  const usage = usageWithFallback(data?.usage, prompt, config.sys, content);
 
-  return { content, reasoning, usage, finish_reason: data?.choices?.[0]?.finish_reason, tag, marker, prompt };
+  return { content, usage, finish_reason: data?.choices?.[0]?.finish_reason, tag, marker, prompt };
 }
 
-async function streamRequest(config, onChunk, signal, threadLog) {
+async function streamRequest(config, onChunk, signal) {
   const { prompt, tag, marker } = buildUserPrompt(config.usr, config.randOn, config.markerLen);
   
   const body = {
@@ -274,38 +227,27 @@ async function streamRequest(config, onChunk, signal, threadLog) {
   const isHttps = urlObj.protocol === 'https:';
   const lib = isHttps ? https : http;
 
-  // Get next token from rotation
-  const { token, index, total } = getNextToken(config);
-  
-  // Record token index in thread log
-  if (threadLog) {
-    threadLog.tokenIndex = index;
-    threadLog.tokenTotal = total;
-  }
-
   return new Promise((resolve, reject) => {
-    // Check if already aborted before starting
     if (signal?.aborted) {
       reject(new Error('Aborted'));
       return;
     }
 
+    const disguiseHeaders = buildDisguiseHeaders();
     const reqOptions = {
       hostname: urlObj.hostname,
       port: urlObj.port || (isHttps ? 443 : 80),
       path: urlObj.pathname,
       method: 'POST',
       headers: {
-        'User-Agent': CHERRY_STUDIO_USER_AGENT,
-        'Authorization': 'Bearer ' + token,
+        ...disguiseHeaders,
+        'Authorization': 'Bearer ' + config.token,
         'Content-Type': 'application/json'
       },
-      timeout: config.timeout || 60000,
-      agent: isHttps ? httpsAgent : httpAgent
+      timeout: config.timeout || 60000
     };
 
     let fullContent = '';
-    let fullReasoning = '';
     let usage = { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 };
     let finishReason = null;
     let aborted = false;
@@ -353,23 +295,10 @@ async function streamRequest(config, onChunk, signal, threadLog) {
             const json = JSON.parse(payload);
             if (json.error) throw new Error(json.error.message);
             
-            const delta = json.choices?.[0]?.delta;
-            if (delta?.content) {
-              fullContent += delta.content;
-            }
-            if (delta?.reasoning_content) {
-              fullReasoning += delta.reasoning_content;
-            }
-            // Call onChunk with combined output
-            if (onChunk && (delta?.content || delta?.reasoning_content)) {
-              let fullOutput = '';
-              if (fullReasoning) {
-                fullOutput += '💭 ' + fullReasoning + '\n---\n';
-              }
-              if (fullContent) {
-                fullOutput += fullContent;
-              }
-              onChunk(delta?.content || delta?.reasoning_content, fullOutput);
+            const delta = json.choices?.[0]?.delta?.content;
+            if (delta) {
+              fullContent += delta;
+              if (onChunk) onChunk(delta, fullContent);
             }
             
             if (json.usage) usage = json.usage;
@@ -389,10 +318,9 @@ async function streamRequest(config, onChunk, signal, threadLog) {
 
       res.on('end', () => {
         cleanup();
-        const finalUsage = usageWithFallback(usage, prompt, config.sys, fullContent + fullReasoning);
+        const finalUsage = usageWithFallback(usage, prompt, config.sys, fullContent);
         resolve({
           content: fullContent,
-          reasoning: fullReasoning,
           usage: finalUsage,
           finish_reason: finishReason,
           tag,
@@ -446,11 +374,6 @@ class TaskExecutor {
     this.notifyTimer = null;
     this.notifyInterval = 500; // ms between notifications (increased for high concurrency)
     
-    // 停滞自动暂停：跟踪最后一次成功时间
-    this.lastSuccessTime = Date.now();
-    this.stallCheckTimer = null;
-    this.stallCheckInterval = 60000; // 每分钟检查一次
-    
     // Load from saved progress or initialize fresh
     if (savedProgress) {
       this.stats = savedProgress.stats || {
@@ -513,8 +436,8 @@ class TaskExecutor {
         thread: threadId,
         loop: i,
         status: 'running',
-        message: '',
-        markerLen: this.markerLen
+        startTime: Date.now(),
+        message: ''
       };
 
       this.threadLogs[threadId] = threadLog;
@@ -525,24 +448,21 @@ class TaskExecutor {
         const result = this.config.streamOn
           ? await streamRequest(
               { ...this.config, markerLen: this.markerLen },
-              (delta, fullOutput) => {
+              (delta, full) => {
                 threadLog.status = 'streaming';
-                threadLog.content = fullOutput?.slice(-LOG_CONTENT_MAX_LENGTH);
+                threadLog.content = full;
                 // notifyUpdate already throttled, so this is fine
                 this.notifyUpdate();
               },
-              this.controller.signal,
-              threadLog
+              this.controller.signal
             )
           : await requestOnce(
               { ...this.config, markerLen: this.markerLen },
-              this.controller.signal,
-              threadLog
+              this.controller.signal
             );
 
         this.stats.completed++;
         this.stats.success++;
-        this.lastSuccessTime = Date.now(); // 更新最后成功时间
         this.stats.promptTokens += result.usage.prompt_tokens;
         this.stats.completionTokens += result.usage.completion_tokens;
         this.stats.totalTokens += result.usage.total_tokens;
@@ -557,15 +477,7 @@ class TaskExecutor {
           log.info('Task', this.taskId, 'reached token limit:', this.stats.totalTokens);
         } else {
           threadLog.status = 'success';
-          // Combine reasoning and content, then slice
-          let fullOutput = '';
-          if (result.reasoning) {
-            fullOutput += '💭 ' + result.reasoning + '\n---\n';
-          }
-          if (result.content) {
-            fullOutput += result.content;
-          }
-          threadLog.content = fullOutput.slice(-LOG_CONTENT_MAX_LENGTH);
+          threadLog.content = result.content?.slice(-500);
         }
 
         // Adjust marker for ratio
@@ -577,39 +489,31 @@ class TaskExecutor {
         if (this.config.randOn) {
           const diff = liveRatio - this.ratio.target;
           if (Math.abs(diff) >= 0.02) {
-            const step = Math.max(1, Math.round(Math.abs(diff) * RATIO_STEP_MULTIPLIER));
-            if (diff < 0) this.markerLen = Math.min(100000, this.markerLen + step);
+            const step = Math.max(1, Math.round(Math.abs(diff) * 50));
+            if (diff < 0) this.markerLen = Math.min(4000, this.markerLen + step);
             else this.markerLen = Math.max(0, this.markerLen - step);
           }
           this.ratio.markerLen = this.markerLen;
         }
 
-        // Add markerLen info to thread log
-        threadLog.markerLen = this.markerLen;
-
       } catch (e) {
         const isAborted = e.message === 'Aborted' || e.name === 'AbortError';
         
         if (isAborted) {
-          // Distinguish between pause and stop
           if (this.paused) {
-            // Paused - don't count as aborted, keep current progress
             threadLog.status = 'paused';
             threadLog.message = '已暂停，等待继续...';
             log.debug('Thread', threadId, 'loop', i, 'paused');
-            this.notifyUpdate(true); // Force update for pause
-            // Wait for resume
+            this.notifyUpdate(true);
             while (this.paused && !this.stopped) {
               await new Promise(resolve => setTimeout(resolve, 100));
             }
-            // If resumed and not stopped, retry current loop with new controller
             if (!this.stopped) {
-              i--; // Retry current loop
+              i--;
               threadLog.status = 'running';
               continue;
             }
           }
-          // Stopped - count as aborted
           if (this.stopped) {
             this.stats.completed++;
             this.stats.aborted++;
@@ -617,30 +521,6 @@ class TaskExecutor {
             log.debug('Thread', threadId, 'loop', i, 'aborted');
           }
         } else {
-          // 检查是否是可重试的网络错误（TLS 握手失败等）
-          if (isRetryableError(e)) {
-            // 获取或初始化重试计数
-            const retryKey = `${threadId}-${i}`;
-            if (!this._retryCount) this._retryCount = {};
-            this._retryCount[retryKey] = (this._retryCount[retryKey] || 0) + 1;
-            
-            if (this._retryCount[retryKey] <= MAX_RETRIES) {
-              threadLog.status = 'retrying';
-              threadLog.message = `网络错误，重试 ${this._retryCount[retryKey]}/${MAX_RETRIES}...`;
-              log.warn('Thread', threadId, 'loop', i, 'retryable error:', e.message, 'retry', this._retryCount[retryKey]);
-              this.notifyUpdate(true);
-              
-              // 指数退避等待
-              await new Promise(resolve => setTimeout(resolve, 100 * this._retryCount[retryKey]));
-              
-              // 重试当前循环
-              i--;
-              continue;
-            }
-            // 重试次数用尽，清理计数
-            delete this._retryCount[retryKey];
-          }
-          
           this.stats.failed++;
           threadLog.status = 'error';
           threadLog.error = e.message || '请求失败';
@@ -648,6 +528,7 @@ class TaskExecutor {
         }
       }
 
+      threadLog.endTime = Date.now();
       this.notifyUpdate(true); // Force update after each request completes
       
       // Wait between loops (not after the last loop)
@@ -692,9 +573,6 @@ class TaskExecutor {
     }
     
     this.notifyUpdate();
-    
-    // 启动停滞检查定时器
-    this.startStallCheck();
 
     // Run workers in parallel
     const workers = [];
@@ -705,7 +583,6 @@ class TaskExecutor {
     await Promise.all(workers);
 
     this.running = false;
-    this.stopStallCheck(); // 停止停滞检查
     log.info('TaskExecutor finished:', this.taskId, 'success:', this.stats.success, 'failed:', this.stats.failed, 'tokens:', this.stats.totalTokens);
     this.notifyUpdate(true); // Force final update
     
@@ -717,7 +594,6 @@ class TaskExecutor {
     if (!this.running || this.paused) return;
     log.info('TaskExecutor pausing:', this.taskId);
     this.paused = true;
-    this.stopStallCheck(); // 停止停滞检查
     if (this.startTime) {
       this.elapsedBefore += Date.now() - this.startTime;
       this.startTime = null;
@@ -731,9 +607,6 @@ class TaskExecutor {
     if (!this.running || !this.paused) return;
     log.info('TaskExecutor resuming:', this.taskId);
     this.paused = false;
-    this.lastSuccessTime = Date.now(); // 重置成功时间
-    this.startStallCheck(); // 重启停滞检查
-    // Create new AbortController for resumed execution
     this.controller = new AbortController();
     this.startTime = Date.now();
     this.notifyUpdate();
@@ -743,43 +616,9 @@ class TaskExecutor {
     log.info('TaskExecutor stopping:', this.taskId);
     this.stopped = true;
     this.paused = false;
-    this.stopStallCheck(); // 停止停滞检查
     this.controller.abort();
   }
 
-  // 启动停滞检查定时器
-  startStallCheck() {
-    if (this.stallCheckTimer) return;
-    this.lastSuccessTime = Date.now();
-    this.stallCheckTimer = setInterval(() => this.checkStall(), this.stallCheckInterval);
-  }
-
-  // 停止停滞检查定时器
-  stopStallCheck() {
-    if (this.stallCheckTimer) {
-      clearInterval(this.stallCheckTimer);
-      this.stallCheckTimer = null;
-    }
-  }
-
-  // 检查是否停滞，如果超时则自动暂停
-  checkStall() {
-    if (this.paused || this.stopped) return;
-    
-    const timeSinceLastSuccess = Date.now() - this.lastSuccessTime;
-    if (timeSinceLastSuccess >= STALL_TIMEOUT_MS) {
-      log.warn('Task', this.taskId, '停滞超时，自动暂停。最后成功时间:', new Date(this.lastSuccessTime).toISOString());
-      this.pause();
-      // 通知前端
-      if (this.onUpdate) {
-        const status = this.getStatus();
-        status.stallAutoPaused = true;
-        status.stallMessage = `连续 ${Math.round(STALL_TIMEOUT_MS / 60000)} 分钟无成功请求，已自动暂停`;
-        this.onUpdate(status);
-      }
-    }
-  }
-
   getStatus() {
     let elapsed = this.elapsedBefore;
     if (this.startTime && !this.paused) {
@@ -794,7 +633,7 @@ class TaskExecutor {
       ratio: this.ratio,
       elapsed: elapsed,
       elapsedBefore: this.elapsedBefore,
-      threadLogs: { ...this.threadLogs }, // Shallow copy for thread safety
+      threadLogs: { ...this.threadLogs },
       threadProgress: { ...this.threadProgress },
       markerLen: this.markerLen
     };
@@ -844,4 +683,4 @@ class TaskExecutor {
   }
 }
 
-module.exports = { TaskExecutor, fetchModels, getNextToken };
+module.exports = { TaskExecutor, fetchModels };

logger.js

@@ -2,7 +2,7 @@
 // LOG_LEVEL: debug, info, warn, error, none (default: info)
 
 const LOG_LEVELS = { debug: 0, info: 1, warn: 2, error: 3, none: 4 };
-const currentLevel = LOG_LEVELS[process.env.LOG_LEVEL?.toLowerCase()] ?? LOG_LEVELS.error;
+const currentLevel = LOG_LEVELS[process.env.LOG_LEVEL?.toLowerCase()] ?? LOG_LEVELS.info;
 
 const ts = () => new Date().toISOString();
 

package-lock.json

@@ -8,7 +8,6 @@
       "name": "token-consumer",
       "version": "1.0.0",
       "dependencies": {
-        "compression": "^1.8.1",
         "cors": "^2.8.5",
         "express": "^4.18.2",
         "uuid": "^9.0.0"
@@ -187,45 +186,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmmirror.com/compression/-/compression-1.8.1.tgz",
-      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
-      "license": "MIT",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "compressible": "~2.0.18",
-        "debug": "2.6.9",
-        "negotiator": "~0.6.4",
-        "on-headers": "~1.1.0",
-        "safe-buffer": "5.2.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/compression/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -934,15 +894,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/on-headers": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmmirror.com/on-headers/-/on-headers-1.1.0.tgz",
-      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",

package.json

@@ -8,14 +8,11 @@
     "dev": "cross-env LOG_LEVEL=debug nodemon server.js"
   },
   "nodemonConfig": {
-    "ignore": [
-      "data/*"
-    ]
+    "ignore": ["data/*"]
   },
   "dependencies": {
-    "compression": "^1.8.1",
-    "cors": "^2.8.5",
     "express": "^4.18.2",
+    "cors": "^2.8.5",
     "uuid": "^9.0.0"
   },
   "devDependencies": {

server.js

@@ -1,25 +1,15 @@
 const express = require('express');
 const cors = require('cors');
-const compression = require('compression');
 const { v4: uuidv4 } = require('uuid');
 const path = require('path');
 const os = require('os');
-const http = require('http');
-const https = require('https');
 const storage = require('./storage');
 const { TaskExecutor, fetchModels } = require('./executor');
 const log = require('./logger');
 
-// 设置全局 HTTP Agent 的最大连接数，支持高并发
-http.globalAgent.maxSockets = 1000;
-https.globalAgent.maxSockets = 1000;
-
 const app = express();
 const PORT = process.env.PORT || 51730;
 
-// Configuration
-const MAX_THREADS = 1000;
-
 // Auth configuration
 const AUTH_USER = process.env.AUTH_USER || 'admin';
 const AUTH_PASS = process.env.AUTH_PASS || 'admin';
@@ -58,9 +48,8 @@ function rateLimiter(req, res, next) {
 }
 
 // Middleware
-app.use(compression());
 app.use(cors());
-app.use(express.json({ limit: '50mb' }));
+app.use(express.json());
 app.use(rateLimiter);
 
 // HTTP Basic Auth middleware for /api routes
@@ -126,7 +115,7 @@ app.post('/api/tasks', (req, res) => {
         sys: config.sys || '',
         usr: config.usr,
         loop: Math.max(1, Math.min(10000, Number(config.loop) || 10)),
-        threads: Math.max(1, Math.min(MAX_THREADS, Number(config.threads) || 3)),
+        threads: Math.max(1, Math.min(200, Number(config.threads) || 3)),
         max: Math.max(1, Math.min(32768, Number(config.max) || 1024)),
         temp: Math.max(0, Math.min(2, Number(config.temp) || 1)),
         timeout: Math.max(5000, Number(config.timeout) || 60000),
@@ -171,23 +160,10 @@ app.get('/api/tasks', (req, res) => {
       if (!t.stats.total && t.config) {
         t.stats.total = (t.config.loop || 10) * (t.config.threads || 3);
       }
-      const status = executor?.getStatus() || null;
-      // Remove threadLogs and threadProgress from list view to reduce payload
-      if (status) {
-        delete status.threadLogs;
-        delete status.threadProgress;
-      }
-      // Create shallow copy and remove threadLogs/threadProgress from progress
-      const taskCopy = { ...t };
-      if (taskCopy.progress) {
-        taskCopy.progress = { ...taskCopy.progress };
-        delete taskCopy.progress.threadLogs;
-        delete taskCopy.progress.threadProgress;
-      }
       return {
-        ...taskCopy,
+        ...t,
         running: executor?.running || false,
-        currentStats: status
+        currentStats: executor?.getStatus() || null
       };
     });
     log.debug('GET /api/tasks, count:', result.length);
@@ -497,16 +473,6 @@ app.get('/', (req, res) => {
   res.sendFile(path.join(__dirname, 'token-consumer.html'));
 });
 
-// Global error handler - must be after all routes
-app.use((err, req, res, next) => {
-  log.error('Unhandled error:', err.message);
-  // Ensure JSON response for API routes
-  if (req.path.startsWith('/api')) {
-    return res.status(500).json({ error: err.message || '服务器内部错误' });
-  }
-  res.status(500).send('服务器内部错误');
-});
-
 // Resume running tasks on startup
 function resumeRunningTasks() {
   const tasks = storage.getAllTasks();

token-consumer.html

@@ -38,7 +38,7 @@ button:disabled{opacity:.5;cursor:not-allowed;transform:none}
 .box label{font-size:11px;color:#64748b;margin-bottom:4px}
 .box b{display:block;font-size:22px;color:#60a5fa;margin-top:4px}
 .logs{grid-template-columns:repeat(auto-fill,minmax(280px,1fr))}
-.log{border:1px solid #334155;border-radius:10px;background:linear-gradient(145deg,#1e293b,#0f172a);padding:10px;transition:all 0.2s;height:180px;display:flex;flex-direction:column}
+.log{border:1px solid #334155;border-radius:10px;background:linear-gradient(145deg,#1e293b,#0f172a);padding:10px;transition:all 0.2s}
 .log.waiting{border-color:#475569}
 .log.running{border-color:#3b82f6;border-width:2px;box-shadow:0 0 15px rgba(59,130,246,0.3)}
 .log.success{border-color:#22c55e;box-shadow:0 0 10px rgba(34,197,94,0.2)}
@@ -48,7 +48,7 @@ button:disabled{opacity:.5;cursor:not-allowed;transform:none}
 .log.paused{border-color:#f59e0b;box-shadow:0 0 10px rgba(245,158,11,0.2)}
 .t{display:flex;justify-content:space-between;font-size:13px;font-weight:600;margin-bottom:6px;color:#e2e8f0}
 .m{font-size:11px;color:#64748b;margin-bottom:6px}
-pre{margin:0;background:#0f172a;color:#93c5fd;border-radius:6px;padding:8px;flex:1;overflow:auto;white-space:pre-wrap;word-break:break-word;font-size:11px}
+pre{margin:0;background:#0f172a;color:#93c5fd;border-radius:6px;padding:8px;min-height:80px;max-height:180px;overflow:auto;white-space:pre-wrap;word-break:break-word;font-size:11px}
 pre::-webkit-scrollbar{width:5px;height:5px}
 pre::-webkit-scrollbar-track{background:#1e293b;border-radius:3px}
 pre::-webkit-scrollbar-thumb{background:#475569;border-radius:3px}
@@ -217,6 +217,16 @@ pre::-webkit-scrollbar-thumb{background:#475569;border-radius:3px}
   </div>
   <span class="task-badge idle" id="detailBadge">空闲</span>
 </div>
+<div id="configInfo" style="background:rgba(100,116,139,0.1);border:1px solid rgba(100,116,139,0.2);border-radius:8px;padding:10px;margin:10px 0;font-size:12px;color:#94a3b8">
+  <div style="display:flex;flex-wrap:wrap;gap:8px 16px">
+    <span>模型: <b id="infoModel" style="color:#60a5fa">-</b></span>
+    <span>max_tokens: <b id="infoMaxTokens" style="color:#60a5fa">-</b></span>
+    <span>累计上限: <b id="infoMaxLimit" style="color:#60a5fa">-</b></span>
+    <span>线程: <b id="infoThreads" style="color:#60a5fa">-</b></span>
+    <span>循环: <b id="infoLoop" style="color:#60a5fa">-</b></span>
+    <span>温度: <b id="infoTemp" style="color:#60a5fa">-</b></span>
+  </div>
+</div>
 <div class="task-progress">
   <div class="progress-row">
     <span class="progress-label">任务</span>
@@ -238,10 +248,6 @@ pre::-webkit-scrollbar-thumb{background:#475569;border-radius:3px}
     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M12 6v6l4 2"/></svg>
     <span id="bannerTime">0s</span>
   </div>
-  <div class="meta-item">
-    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/></svg>
-    <span>线程 <b id="detailThreads">0</b></span>
-  </div>
   <div class="meta-item">
     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"/><polyline points="22 4 12 14.01 9 11.01"/></svg>
     <span>成功 <b id="detailSuccess" style="color:#4ade80">0</b></span>
@@ -290,7 +296,7 @@ pre::-webkit-scrollbar-thumb{background:#475569;border-radius:3px}
 </div>
 <div class="g3" style="margin-top:8px">
 <label>每线程循环次数<input id="loop" type="number" min="1" value="10"></label>
-<label>并发线程数<input id="thr" type="number" min="1" max="1000" value="3"></label>
+<label>并发线程数<input id="thr" type="number" min="1" value="3"></label>
 <label>max_tokens<input id="max" type="number" min="1" value="1024"></label>
 <label>temperature<input id="temp" type="number" min="0" max="2" step="0.1" value="1"></label>
 <label>单次超时秒数<input id="to" type="number" min="5" value="600"></label>
@@ -381,20 +387,9 @@ const getLocal=()=>{try{return JSON.parse(localStorage.getItem(LOCAL_KEY)||'{}')
 const saveLocal=d=>{try{localStorage.setItem(LOCAL_KEY,JSON.stringify(d))}catch{}};
 
 // API functions
-async function apiRequest(url,options={}){
-  const r=await fetch(API+url,options);
-  const ct=r.headers.get('content-type')||'';
-  if(!ct.includes('application/json')){
-    const text=await r.text();
-    throw new Error(r.status===401?'需要认证，请刷新页面重新登录':'服务器返回非JSON响应: '+text.slice(0,100));
-  }
-  const data=await r.json();
-  if(!r.ok)throw new Error(data.error||'请求失败');
-  return data;
-}
-async function apiGet(url){return apiRequest(url)}
-async function apiPost(url,data){return apiRequest(url,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(data)})}
-async function apiDelete(url){return apiRequest(url,{method:'DELETE'})}
+async function apiGet(url){const r=await fetch(API+url);return r.json()}
+async function apiPost(url,data){const r=await fetch(API+url,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(data)});return r.json()}
+async function apiDelete(url){const r=await fetch(API+url,{method:'DELETE'});return r.json()}
 
 // Load tasks
 async function loadTasks(){
@@ -495,10 +490,6 @@ function renderTaskList(){
             <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M12 6v6l4 2"/></svg>
             <span>${elapsedStr||'-'}</span>
           </div>
-          <div class="meta-item">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/></svg>
-            <span>线程 <b>${t.config?.threads||0}</b></span>
-          </div>
           <div class="meta-item">
             <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"/><polyline points="22 4 12 14.01 9 11.01"/></svg>
             <span>成功 <b style="color:#4ade80">${stats.success||0}</b></span>
@@ -582,6 +573,7 @@ function fillForm(d){
   $('randOn').checked=!!d.randOn;
   $('streamOn').checked=d.streamOn!==false;
   $('ratioTarget').value=d.ratioTarget||1;
+  updateConfigInfo();
 }
 
 // Get form data
@@ -596,7 +588,7 @@ function getFormData(){
       sys:$('sys').value.trim(),
       usr:$('usr').value.trim(),
       loop:n($('loop').value,10,1,10000),
-      threads:n($('thr').value,3,1,1000),
+      threads:n($('thr').value,3,1,200),
       max:n($('max').value,1024,1,32768),
       temp:n($('temp').value,1,0,2),
       timeout:n($('to').value,600,5,3600)*1000,
@@ -609,6 +601,16 @@ function getFormData(){
   };
 }
 
+// Update config info display
+function updateConfigInfo(){
+  $('infoModel').textContent=$('modelAuto').value||'-';
+  $('infoMaxTokens').textContent=$('max').value||1024;
+  $('infoMaxLimit').textContent=fmt(Number($('maxTokens').value)||1000000000);
+  $('infoThreads').textContent=$('thr').value||3;
+  $('infoLoop').textContent=$('loop').value||10;
+  $('infoTemp').textContent=$('temp').value||1;
+}
+
 // Save task
 async function saveTask(){
   const data=getFormData();
@@ -786,7 +788,6 @@ function updateStats(s){
   $('bannerProgress').textContent=`${completed}/${total}`;
   $('bannerTokens').textContent=`${fmt(totalTokens)}/${fmt(maxTokens)}`;
   $('bannerTime').textContent=fmtTime(s.elapsed||0);
-  $('detailThreads').textContent=$('thr').value||0;
   $('detailSuccess').textContent=s.stats?.success||0;
   $('detailFailed').textContent=s.stats?.failed||0;
   $('detailAborted').textContent=s.stats?.aborted||0;
@@ -818,18 +819,10 @@ function updateLogs(threadLogs){
     }else if(log.message){
       displayContent=log.message;
     }
-    // Build info line
-    let infoLine=`循环:${log.loop||'-'}`;
-    if(log.markerLen!==undefined){
-      infoLine+=` | 标记:${log.markerLen}`;
-    }
-    if(log.tokenTotal!==undefined && log.tokenTotal>1){
-      infoLine+=` | Key:${log.tokenIndex+1}/${log.tokenTotal}`;
-    }
     return`
       <div class="log ${statusClass}">
         <div class="t"><span>线程 #${id}</span><span>${log.status}</span></div>
-        <div class="m">${infoLine}</div>
+        <div class="m">循环:${log.loop||'-'}</div>
         <pre>${displayContent.slice(-500)}</pre>
       </div>
     `;
@@ -862,14 +855,21 @@ function updateTaskHeader(task){
   badge.textContent=statusText;
   badge.className='badge '+status;
   
-  // Update status card
   const statusCard=$('statusCard');
   statusCard.className='card status-card '+status;
   $('detailStatusDot').className='status-dot '+status;
   $('detailBadge').className='task-badge '+status;
   $('detailBadge').textContent=statusText;
   $('bannerLabel').textContent=statusText;
-  $('detailThreads').textContent=$('thr').value||0;
+  
+  if(task.config){
+    $('infoModel').textContent=task.config.model||'-';
+    $('infoMaxTokens').textContent=task.config.max||'-';
+    $('infoMaxLimit').textContent=fmt(task.config.maxTokens||0);
+    $('infoThreads').textContent=task.config.threads||'-';
+    $('infoLoop').textContent=task.config.loop||'-';
+    $('infoTemp').textContent=task.config.temp||'-';
+  }
   
   updateButtons(task.running, task.currentStats?.paused, task.stopped);
 }
@@ -884,7 +884,6 @@ function startPolling(taskId){
       updateLogs(s.threadLogs);
       updateButtons(s.running, s.paused, s.stopped);
       
-      // Update status card
       let status='idle', statusText='空闲';
       if(s.running && s.paused){
         status='paused';
@@ -903,6 +902,16 @@ function startPolling(taskId){
       $('detailBadge').textContent=statusText;
       $('bannerLabel').textContent=statusText;
       
+      const task=tasks.find(t=>t.id===taskId);
+      if(task?.config){
+        $('infoModel').textContent=task.config.model||'-';
+        $('infoMaxTokens').textContent=task.config.max||'-';
+        $('infoMaxLimit').textContent=fmt(task.config.maxTokens||0);
+        $('infoThreads').textContent=task.config.threads||'-';
+        $('infoLoop').textContent=task.config.loop||'-';
+        $('infoTemp').textContent=task.config.temp||'-';
+      }
+      
       if(!s.running){
         $('start').textContent='启动任务';
         await loadTasks();
@@ -1079,11 +1088,18 @@ function newTask(){
   $('bannerProgress').textContent='0/0';
   $('bannerTokens').textContent='0/0';
   $('bannerTime').textContent='0s';
-  $('detailThreads').textContent=$('thr').value||'0';
   $('detailSuccess').textContent='0';
   $('detailFailed').textContent='0';
   $('detailAborted').textContent='0';
   
+  // Update config info
+  $('infoModel').textContent=local.model||'-';
+  $('infoMaxTokens').textContent=local.max||1024;
+  $('infoMaxLimit').textContent=fmt(local.maxTokens||1000000000);
+  $('infoThreads').textContent=local.threads||3;
+  $('infoLoop').textContent=local.loop||10;
+  $('infoTemp').textContent=local.temp||1;
+  
   updateButtons(false, false, false);
   showEditView();
   stopPolling();
@@ -1111,6 +1127,11 @@ $('detailStartBtn').onclick=startTask;
 $('detailPauseBtn').onclick=pauseTask;
 $('detailStopBtn').onclick=stopTask;
 
+// Config info update on input change
+['modelAuto','max','maxTokens','thr','loop','temp'].forEach(id=>{
+  $(id).addEventListener('input',updateConfigInfo);
+});
+
 // Memory status update
 function formatBytes(bytes){
   if(bytes>=1e9)return(bytes/1e9).toFixed(1)+' GB';
@@ -1163,11 +1184,40 @@ loadTasks();
     $('base').value=local.base||'https://api.openai.com';
     $('token').value=local.token||'';
   }
+  if(local.model)$('modelAuto').value=local.model;
+  if(local.sys)$('sys').value=local.sys;
+  if(local.usr)$('usr').value=local.usr;
+  if(local.loop)$('loop').value=local.loop;
+  if(local.threads)$('thr').value=local.threads;
+  if(local.max)$('max').value=local.max;
+  if(local.temp)$('temp').value=local.temp;
+  if(local.timeout)$('to').value=local.timeout/1000;
+  if(local.waitBetween)$('waitBetween').value=local.waitBetween;
+  if(local.maxTokens)$('maxTokens').value=local.maxTokens;
+  if(local.ratioTarget)$('ratioTarget').value=local.ratioTarget;
+  if(local.randOn!==undefined)$('randOn').checked=local.randOn;
+  if(local.streamOn!==undefined)$('streamOn').checked=local.streamOn;
+  
   // Load server config
   try{
     const serverConfig=await apiGet('/api/config');
     if(Object.keys(serverConfig).length){
       saveLocal({...local,...serverConfig});
+      if(serverConfig.base)$('base').value=serverConfig.base;
+      if(serverConfig.token)$('token').value=serverConfig.token;
+      if(serverConfig.model)$('modelAuto').value=serverConfig.model;
+      if(serverConfig.sys)$('sys').value=serverConfig.sys;
+      if(serverConfig.usr)$('usr').value=serverConfig.usr;
+      if(serverConfig.loop)$('loop').value=serverConfig.loop;
+      if(serverConfig.threads)$('thr').value=serverConfig.threads;
+      if(serverConfig.max)$('max').value=serverConfig.max;
+      if(serverConfig.temp)$('temp').value=serverConfig.temp;
+      if(serverConfig.timeout)$('to').value=serverConfig.timeout/1000;
+      if(serverConfig.waitBetween)$('waitBetween').value=serverConfig.waitBetween;
+      if(serverConfig.maxTokens)$('maxTokens').value=serverConfig.maxTokens;
+      if(serverConfig.ratioTarget)$('ratioTarget').value=serverConfig.ratioTarget;
+      if(serverConfig.randOn!==undefined)$('randOn').checked=serverConfig.randOn;
+      if(serverConfig.streamOn!==undefined)$('streamOn').checked=serverConfig.streamOn;
     }
   }catch(e){}