Update index.js

index.js

@@ -7,6 +7,8 @@ import puppeteer from 'puppeteer-extra'
 import StealthPlugin from 'puppeteer-extra-plugin-stealth'
 import { v4 as uuidv4 } from 'uuid';
 import Logger from './logger.js';
+import fs from 'fs';
+import path from 'path';
 
 dotenv.config();
 
@@ -26,16 +28,16 @@ const CONFIG = {
         API_KEY: process.env.API_KEY || "sk-123456",
         SIGNATURE_COOKIE: null,
         TEMP_COOKIE: null,
-        PICGO_KEY: process.env.PICGO_KEY || null //想要流式生图的话需要填入这个PICGO图床的key
+        PICGO_KEY: process.env.PICGO_KEY || null //想要生图的话需要填入这个PICGO图床的key
     },
     SERVER: {
         PORT: process.env.PORT || 3000,
         BODY_LIMIT: '5mb'
     },
     RETRY: {
-        MAX_ATTEMPTS: 2//重试次数
+        MAX_ATTEMPTS: 2,//重试次数
+        DELAY_BASE: 1000 // 基础延迟时间（毫秒）
     },
-    SHOW_THINKING:process.env.SHOW_THINKING === 'true',//显示思考过程
     IS_THINKING: false,
     IS_IMG_GEN: false,
     IS_IMG_GEN2: false,
@@ -189,7 +191,7 @@ class AuthTokenManager {
 
 class Utils {
     static async extractGrokHeaders() {
-        Logger.info("开始提取头信息", 'Server');
+        console.log("开始提取头信息");
         try {
             // 启动浏览器
             const browser = await puppeteer.launch({
@@ -208,6 +210,7 @@ class Utils {
             await page.evaluate(() => {
                 return new Promise(resolve => setTimeout(resolve, 5000))
             })
+            console.log('等待5秒完成')
             // 获取所有 Cookies
             const cookies = await page.cookies();
             const targetHeaders = ['x-anonuserid', 'x-challenge', 'x-signature'];
@@ -222,11 +225,11 @@ class Utils {
             // 关闭浏览器
             await browser.close();
             // 打印并返回提取的头信息
-            Logger.info('提取的头信息:', JSON.stringify(extractedHeaders, null, 2), 'Server');
+            console.log('提取的头信息:', JSON.stringify(extractedHeaders, null, 2));
             return extractedHeaders;
 
         } catch (error) {
-            Logger.error('获取头信息出错:', error, 'Server');
+            console.error('获取头信息出错:', error);
             return null;
         }
     }
@@ -234,12 +237,12 @@ class Utils {
         if (CONFIG.API.TEMP_COOKIE) {
             return CONFIG.API.TEMP_COOKIE;
         }
-        Logger.info("刷新认证信息", 'Server');
+        console.log("刷新认证信息");
         let retryCount = 0;
         while (!CONFIG.API.TEMP_COOKIE || retryCount < CONFIG.RETRY.MAX_ATTEMPTS) {
             let headers = await Utils.extractGrokHeaders();
             if (headers) {
-                Logger.info("获取认证信息成功", 'Server');
+                console.log("获取认证信息成功");
                 CONFIG.API.TEMP_COOKIE = { cookie: `x-anonuserid=${headers["x-anonuserid"]}; x-challenge=${headers["x-challenge"]}; x-signature=${headers["x-signature"]}` };
                 return;
             }
@@ -249,6 +252,53 @@ class Utils {
             }
         }
     }
+    static async handleError(error, res) {
+        // 如果是500错误且提供了原始请求函数，尝试重新获取签名并重试
+        if (String(error).includes("status: 500")) {
+            try {
+                await Utils.get_signature();
+                if (CONFIG.API.SIGNATURE_COOKIE) {
+                    return res.status(500).json({
+                        error: {
+                            message: `${error.message}已重新刷新认证信息，请重新对话`,
+                            type: 'server_error',
+                            param: null,
+                            code: retryError.code || null
+                        }
+                    });
+                } else {
+                    return res.status(500).json({
+                        error: {
+                            message: "认证信息获取失败",
+                            type: 'server_error',
+                            param: null,
+                            code: null
+                        }
+                    });
+                }
+            } catch (error) {
+                console.error('重试失败:', error);
+                return res.status(500).json({
+                    error: {
+                        message: `${error.message},认证信息获取失败`,
+                        type: 'server_error',
+                        param: null,
+                        code: error.code || null
+                    }
+                });
+            }
+        }
+
+        // 其他错误直接返回
+        res.status(500).json({
+            error: {
+                message: error.message,
+                type: 'server_error',
+                param: null,
+                code: error.code || null
+            }
+        });
+    }
     static async organizeSearchResults(searchResults) {
         // 确保传入的是有效的搜索结果对象
         if (!searchResults || !searchResults.results) {
@@ -322,7 +372,7 @@ class GrokApiClient {
                     content: imageBuffer
                 }
             };
-            Logger.info("发送图片请求", 'Server');
+            console.log("发送图片请求");
             // 发送请求
             const response = await fetch(url, {
                 method: 'POST',
@@ -334,46 +384,35 @@ class GrokApiClient {
             });
 
             if (!response.ok) {
-                Logger.error(`上传图片失败,状态码:${response.status},原因:${response.error}`, 'Server');
+                console.error(`上传图片失败,状态码:${response.status},原因:${response.error}`);
                 return '';
             }
 
             const result = await response.json();
-            Logger.info('上传图片成功:', result, 'Server');
+            console.log('上传图片成功:', result);
             return result.fileMetadataId;
 
         } catch (error) {
-            Logger.error(error, 'Server');
+            console.error('上传图片失败:', error);
             return '';
         }
     }
 
     async prepareChatRequest(request) {
-        if ((request.model === 'grok-2-imageGen' || request.model === 'grok-3-imageGen') && !CONFIG.API.PICGO_KEY && request.stream) {
-            throw new Error(`该模型流式输出需要配置PICGO图床密钥!`);
-        }
-        
-        // 处理画图模型的消息限制
-        let todoMessages = request.messages;
-        if (request.model === 'grok-2-imageGen' || request.model === 'grok-3-imageGen') {
-            const lastMessage = todoMessages[todoMessages.length - 1];
-            if (lastMessage.role !== 'user') {
-                throw new Error('画图模型的最后一条消息必须是用户消息!');
-            }
-            todoMessages = [lastMessage]; 
+        if ((request.model === 'grok-2-imageGen' || request.model === 'grok-3-imageGen') && !CONFIG.API.PICGO_KEY) {
+            throw new Error(`该模型需要配置PICGO图床密钥!`);
         }
         
+        const todoMessages = request.messages;
         const fileAttachments = [];
         let messages = '';
         let lastRole = null;
         let lastContent = '';
         const search = request.model === 'grok-2-search';
     
-        // 移除<think>标签及其内容和base64图片
+        // 移除<think>标签及其内容
         const removeThinkTags = (text) => {
-            text = text.replace(/<think>[\s\S]*?<\/think>/g, '').trim();
-            text = text.replace(/!\[image\]\(data:.*?base64,.*?\)/g, '[图片]');
-            return text;
+            return text.replace(/<think>[\s\S]*?<\/think>/g, '').trim();
         };
     
         const processImageUrl = async (content) => {
@@ -446,7 +485,7 @@ class GrokApiClient {
         return {
             modelName: this.modelId,
             message: messages.trim(),
-            fileAttachments: fileAttachments.slice(0, 4),
+            fileAttachments: fileAttachments.slice(0, 4), // 最多保留4张图片
             imageAttachments: [],
             disableSearch: false,
             enableImageGeneration: true,
@@ -540,8 +579,6 @@ async function processModelResponse(linejosn, model) {
             }
             return result;
         case 'grok-3-reasoning':
-            if(linejosn?.isThinking && !CONFIG.SHOW_THINKING)return result;
-
             if (linejosn?.isThinking && !CONFIG.IS_THINKING) {
                 result.token = "<think>" + token;
                 CONFIG.IS_THINKING = true;
@@ -561,8 +598,8 @@ async function handleResponse(response, model, res, isStream) {
         let buffer = '';
         let fullResponse = '';
         const dataPromises = [];
-        
-        return new Promise((resolve, reject) => { 
+
+        return new Promise((resolve, reject) => {
             stream.on('data', async (chunk) => {
                 buffer += chunk.toString();
                 const lines = buffer.split('\n');
@@ -571,15 +608,15 @@ async function handleResponse(response, model, res, isStream) {
                 for (const line of lines) {
                     if (!line.trim()) continue;
                     const trimmedLine = line.trim();
+                    fs.appendFileSync(path.resolve(process.cwd(), 'response4.txt'), trimmedLine + '\n');
                     if (trimmedLine.startsWith('data: ')) {
                         const data = trimmedLine.substring(6);
                         try {
                             if (!data.trim()) continue;
-                            if(data === "[DONE]") continue;
+                            if(data === "[DONE]")continue;
                             const linejosn = JSON.parse(data);
                             if (linejosn?.error) {
-                                stream.destroy();
-                                reject(new Error("RateLimitError")); 
+                                reject(new Error(linejosn));
                                 return;
                             }
                             if (linejosn?.doImgGen || linejosn?.imageAttachmentInfo) {
@@ -606,6 +643,7 @@ async function handleResponse(response, model, res, isStream) {
                             })();
                             dataPromises.push(processPromise);
                         } catch (error) {
+                            console.log(error);
                             continue;
                         }
                     }
@@ -625,14 +663,14 @@ async function handleResponse(response, model, res, isStream) {
                     }
                     CONFIG.IS_IMG_GEN = false;
                     CONFIG.IS_IMG_GEN2 = false;
-                    resolve(); 
+                    resolve();
                 } catch (error) {
-                    reject(error); 
+                    reject(error);
                 }
             });
-
             stream.on('error', (error) => {
-                reject(error); 
+                Logger.error(error, 'Server');
+                reject(error);
             });
         });
     } catch (error) {
@@ -641,15 +679,18 @@ async function handleResponse(response, model, res, isStream) {
         CONFIG.IS_IMG_GEN2 = false;
         throw error;
     }
+
 }
 
 async function handleImageResponse(imageUrl) {
-    const MAX_RETRIES = 2;
+    //对服务器发送图片请求
+    const MAX_RETRIES = 3;
     let retryCount = 0;
     let imageBase64Response;
 
     while (retryCount < MAX_RETRIES) {
         try {
+            //发送图片请求获取图片
             imageBase64Response = await fetch(`https://assets.grok.com/${imageUrl}`, {
                 method: 'GET',
                 headers: {
@@ -658,11 +699,16 @@ async function handleImageResponse(imageUrl) {
                 }
             });
 
-            if (imageBase64Response.ok) break; 
+            if (imageBase64Response.ok) {
+                break; // 如果请求成功，跳出重试循环
+            }
+
             retryCount++;
             if (retryCount === MAX_RETRIES) {
                 throw new Error(`上游服务请求失败! status: ${imageBase64Response.status}`);
             }
+
+            // 等待一段时间后重试（可以使用指数退避）
             await new Promise(resolve => setTimeout(resolve, CONFIG.API.RETRY_TIME * retryCount));
 
         } catch (error) {
@@ -670,20 +716,13 @@ async function handleImageResponse(imageUrl) {
             if (retryCount === MAX_RETRIES) {
                 throw error;
             }
+            // 等待一段时间后重试
             await new Promise(resolve => setTimeout(resolve, CONFIG.API.RETRY_TIME * retryCount));
         }
     }
 
-
     const arrayBuffer = await imageBase64Response.arrayBuffer();
     const imageBuffer = Buffer.from(arrayBuffer);
-
-    if(!CONFIG.API.PICGO_KEY){
-        const base64Image = imageBuffer.toString('base64');
-        const imageContentType = imageBase64Response.headers.get('content-type');
-        return `![image](data:${imageContentType};base64,${base64Image})`
-    }
-
     const formData = new FormData();
 
     formData.append('source', imageBuffer, {
@@ -711,7 +750,6 @@ async function handleImageResponse(imageUrl) {
 
 const tokenManager = new AuthTokenManager();
 await initialization();
-
 // 中间件配置
 const app = express();
 app.use(Logger.requestLogger);
@@ -722,7 +760,7 @@ app.use(cors({
     methods: ['GET', 'POST', 'OPTIONS'],
     allowedHeaders: ['Content-Type', 'Authorization']
 }));
-
+// API路由
 app.get('/hf/v1/models', (req, res) => {
     res.json({
         object: "list",
@@ -748,12 +786,13 @@ app.post('/hf/v1/chat/completions', async (req, res) => {
         while (retryCount < CONFIG.RETRY.MAX_ATTEMPTS) {
             retryCount++;
             const grokClient = new GrokApiClient(req.body.model);
-            const requestPayload = await grokClient.prepareChatRequest(req.body);       
+            const requestPayload = await grokClient.prepareChatRequest(req.body);
+            console.log(JSON.stringify(requestPayload,null,2));
 
             if (!CONFIG.API.TEMP_COOKIE) {
                 await Utils.get_signature();
             }
-
+            //获取验证cookie
             if (isTempCookie) {
                 CONFIG.API.SIGNATURE_COOKIE = CONFIG.API.TEMP_COOKIE;
                 Logger.info(`已切换为临时令牌`, 'Server');
@@ -777,7 +816,7 @@ app.post('/hf/v1/chat/completions', async (req, res) => {
 
             const responseText = await newMessageReq.json();
             const conversationId = responseText.conversationId;
-
+            //发送对话
             const response = await fetch(`${CONFIG.API.BASE_URL}/api/conversations/${conversationId}/responses`, {
                 method: 'POST',
                 headers: {
@@ -796,7 +835,7 @@ app.post('/hf/v1/chat/completions', async (req, res) => {
                 Logger.info(`当前剩余可用令牌数: ${tokenManager.getTokenCount()}`, 'Server');
                 try {
                     await handleResponse(response, req.body.model, res, req.body.stream);
-                    return; 
+                    return; // 成功后直接返��
                 } catch (error) {
                     if(isTempCookie){
                         await Utils.get_signature();
@@ -813,6 +852,7 @@ app.post('/hf/v1/chat/completions', async (req, res) => {
                     }
                 }
             } else {
+                // 处理429错误
                 if (response.status === 429) {
                     if (isTempCookie) {
                         await Utils.get_signature();
@@ -855,11 +895,12 @@ app.post('/hf/v1/chat/completions', async (req, res) => {
 });
 
 
+// 404处理
 app.use((req, res) => {
     res.status(200).send('api运行正常');
 });
 
-
+// 启动服务器
 app.listen(CONFIG.SERVER.PORT, () => {
-    Logger.info(`服务器已启动，监听端口: ${CONFIG.SERVER.PORT}`, 'Server');
+    console.log(`服务器已启动，监听端口: ${CONFIG.SERVER.PORT}`);
 });