Upload 2 files

src/utils/cookieRefresher.js

@@ -480,15 +480,66 @@ async function extractCookiesFromCsvFile(csvFilePath) {
     console.log(`尝试从CSV文件提取cookies (尝试 ${attempt}/${maxExtractAttempts})...`);
     
     try {
-      // 使用新的提取模块
-      const cookies = await extractCookiesFromCsv(csvFilePath);
+      // 读取文件内容
+      if (!fs.existsSync(csvFilePath)) {
+        console.error(`CSV文件不存在: ${csvFilePath}`);
+        return [];
+      }
+      
+      // 读取文件内容并处理可能的换行符
+      let fileContent = fs.readFileSync(csvFilePath, 'utf8');
+      fileContent = fileContent.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+      
+      // 首先尝试直接从文件内容中提取所有可能的cookie
+      const cookies = [];
+      
+      // 1. 检查是否有JWT格式的token (新格式)
+      const jwtRegex = /ey[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
+      const jwtMatches = fileContent.match(jwtRegex);
+      
+      if (jwtMatches && jwtMatches.length > 0) {
+        console.log(`直接从文件内容中提取到 ${jwtMatches.length} 个JWT token格式的Cookie`);
+        jwtMatches.forEach(match => {
+          if (!cookies.includes(match)) {
+            cookies.push(match);
+          }
+        });
+      }
+      
+      // 2. 检查是否有旧格式的cookie
+      if (fileContent.includes('user_')) {
+        console.log('文件包含旧格式cookie标识"user_"');
+        
+        // 使用旧的提取函数尝试提取
+        try {
+          const oldFormatCookies = await extractCookiesFromCsv(csvFilePath);
+          if (oldFormatCookies && oldFormatCookies.length > 0) {
+            console.log(`通过提取模块获取到 ${oldFormatCookies.length} 个cookie`);
+            oldFormatCookies.forEach(cookie => {
+              if (!cookies.includes(cookie)) {
+                cookies.push(cookie);
+              }
+            });
+          }
+        } catch (e) {
+          console.warn('通过提取模块获取cookie失败:', e.message);
+        }
+      }
       
-      if (cookies && cookies.length > 0) {
-        console.log(`成功从CSV文件提取到 ${cookies.length} 个cookies`);
+      // 3. 如果找到了cookie，返回结果
+      if (cookies.length > 0) {
+        const newFormatCount = cookies.filter(c => c.startsWith('ey')).length;
+        const oldFormatCount = cookies.filter(c => c.includes('%3A%3A')).length;
+        
+        console.log(`总共找到 ${cookies.length} 个cookie`);
+        console.log(`新格式cookie(ey开头): ${newFormatCount}个`);
+        console.log(`旧格式cookie(包含%3A%3A): ${oldFormatCount}个`);
+        console.log(`其他格式cookie: ${cookies.length - newFormatCount - oldFormatCount}个`);
+        
         return cookies;
-      } else {
-        console.warn(`未能从CSV文件提取到cookies (尝试 ${attempt}/${maxExtractAttempts})`);
       }
+      
+      console.warn(`未能从文件中提取到任何cookie (尝试 ${attempt}/${maxExtractAttempts})`);
     } catch (error) {
       console.error(`从CSV文件提取cookies时出错 (尝试 ${attempt}/${maxExtractAttempts}):`, error);
     }
@@ -543,14 +594,24 @@ function addNewCookiesToSystem(apiKey, newCookies) {
     
     // 验证cookie是否完整
     const validatedCookies = newValidCookies.filter(cookie => {
-      // 检查cookie是否包含JWT的三个部分
-      if (cookie.includes('%3A%3A')) {
+      // 检查是否是新格式的JWT token (ey开头)
+      if (cookie.startsWith('ey') && cookie.includes('.')) {
+        const parts = cookie.split('.');
+        // 检查JWT是否包含三个部分
+        if (parts.length !== 3) {
+          console.warn(`跳过不完整的JWT cookie (新格式): ${cookie}`);
+          return false;
+        }
+        return true;
+      }
+      // 检查旧格式cookie是否包含JWT的三个部分
+      else if (cookie.includes('%3A%3A')) {
         const parts = cookie.split('%3A%3A');
         if (parts.length === 2) {
           const jwt = parts[1];
           // 检查JWT是否包含点（表示JWT的三个部分）
           if (!jwt.includes('.') || jwt.split('.').length !== 3) {
-            console.warn(`跳过不完整的cookie: ${cookie}`);
+            console.warn(`跳过不完整的cookie (旧格式): ${cookie}`);
             return false;
           }
         }
@@ -704,6 +765,12 @@ async function autoRefreshCookies(apiKey, minCookieCount = config.refresh.minCoo
       };
     }
     
+    // 分析提取到的cookie格式
+    const newFormatCookies = cookies.filter(cookie => cookie.startsWith('ey'));
+    const oldFormatCookies = cookies.filter(cookie => cookie.includes('%3A%3A'));
+    console.log(`提取到 ${newFormatCookies.length} 个新格式cookie(ey开头)`);
+    console.log(`提取到 ${oldFormatCookies.length} 个旧格式cookie(包含%3A%3A)`);
+    
     // 根据配置决定是否将现有cookie标记为无效
     const refreshMode = process.env.COOKIE_REFRESH_MODE || 'append';
     
@@ -723,7 +790,7 @@ async function autoRefreshCookies(apiKey, minCookieCount = config.refresh.minCoo
     
     return {
       success: true,
-      message: `成功添加 ${addedCount} 个新 Cookie`,
+      message: `成功添加 ${addedCount} 个新 Cookie (新格式: ${newFormatCookies.length}, 旧格式: ${oldFormatCookies.length})`,
       refreshed: addedCount
     };
   } catch (error) {

src/utils/extractCookieFromCsv.js

@@ -26,42 +26,91 @@ async function extractCookiesFromCsv(csvFilePath) {
         return resolve([]);
       }
 
+      // 首先尝试直接从文件内容中提取所有可能的cookie
+      const cookies = [];
+      
+      // 检查是否有JWT格式的token (新格式)
+      const jwtRegex = /ey[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
+      const jwtMatches = fileContent.match(jwtRegex);
+      
+      if (jwtMatches && jwtMatches.length > 0) {
+        console.log(`直接从文件内容中提取到 ${jwtMatches.length} 个JWT token格式的Cookie`);
+        jwtMatches.forEach(match => {
+          if (!cookies.includes(match)) {
+            cookies.push(match);
+          }
+        });
+      }
+
       // 检查文件内容是否包含关键字
       const hasTokenKeyword = fileContent.includes('token');
       const hasUserPrefix = fileContent.includes('user_');
       console.log(`文件包含"token"关键字: ${hasTokenKeyword}`);
       console.log(`文件包含"user_"前缀: ${hasUserPrefix}`);
 
-      // 如果文件包含user_前缀，尝试直接从内容中提取cookie
+      // 如果文件包含user_前缀，尝试提取旧格式cookie
       if (hasUserPrefix) {
-        const cookies = extractCookiesFromText(fileContent);
-        if (cookies.length > 0) {
-          console.log(`直接从文件内容中提取到 ${cookies.length} 个Cookie`);
-          return resolve(cookies);
+        const oldFormatCookies = extractCookiesFromText(fileContent);
+        if (oldFormatCookies.length > 0) {
+          console.log(`从文件内容中提取到 ${oldFormatCookies.length} 个旧格式Cookie`);
+          oldFormatCookies.forEach(cookie => {
+            if (!cookies.includes(cookie)) {
+              cookies.push(cookie);
+            }
+          });
         }
       }
 
+      // 如果已经找到cookie，返回结果
+      if (cookies.length > 0) {
+        console.log(`总共提取到 ${cookies.length} 个Cookie`);
+        return resolve(validateCookies(cookies));
+      }
+
       // 使用csv-parser解析CSV文件
-      const cookies = [];
-      const possibleTokenFields = ['token', 'cookie', 'value', 'Token', 'Cookie', 'Value'];
+      const possibleTokenFields = ['token', 'cookie', 'value', 'Token', 'Cookie', 'Value', 'jwt', 'JWT'];
       
       fs.createReadStream(csvFilePath)
         .pipe(csv())
         .on('data', (row) => {
           // 检查所有可能的字段名
           for (const field of possibleTokenFields) {
-            if (row[field] && row[field].includes('user_')) {
-              cookies.push(row[field]);
-              break;
+            if (row[field]) {
+              // 检查是否是JWT格式
+              if (row[field].startsWith('ey') && row[field].includes('.')) {
+                if (!cookies.includes(row[field])) {
+                  cookies.push(row[field]);
+                }
+                break;
+              }
+              // 检查是否是旧格式
+              else if (row[field].includes('user_')) {
+                if (!cookies.includes(row[field])) {
+                  cookies.push(row[field]);
+                }
+                break;
+              }
             }
           }
           
           // 如果没有找到预定义的字段，遍历所有字段
           if (cookies.length === 0) {
             for (const field in row) {
-              if (row[field] && typeof row[field] === 'string' && row[field].includes('user_')) {
-                cookies.push(row[field]);
-                break;
+              if (row[field] && typeof row[field] === 'string') {
+                // 检查是否是JWT格式
+                if (row[field].startsWith('ey') && row[field].includes('.')) {
+                  if (!cookies.includes(row[field])) {
+                    cookies.push(row[field]);
+                  }
+                  break;
+                }
+                // 检查是否是旧格式
+                else if (row[field].includes('user_')) {
+                  if (!cookies.includes(row[field])) {
+                    cookies.push(row[field]);
+                  }
+                  break;
+                }
               }
             }
           }
@@ -74,6 +123,19 @@ async function extractCookiesFromCsv(csvFilePath) {
             console.log('尝试按行读取文件...');
             const lines = fileContent.split('\n');
             for (const line of lines) {
+              // 检查是否有JWT格式token
+              if (line.includes('ey')) {
+                const jwtMatches = line.match(jwtRegex);
+                if (jwtMatches) {
+                  jwtMatches.forEach(match => {
+                    if (!cookies.includes(match)) {
+                      cookies.push(match);
+                    }
+                  });
+                }
+              }
+              
+              // 检查是否有旧格式cookie
               if (line.includes('user_')) {
                 const extractedCookies = extractCookiesFromText(line);
                 extractedCookies.forEach(cookie => {
@@ -86,18 +148,6 @@ async function extractCookiesFromCsv(csvFilePath) {
             console.log(`按行读取后提取到 ${cookies.length} 个Cookie`);
           }
           
-          // 如果仍然没有找到cookie，尝试从整个文件内容中提取
-          if (cookies.length === 0) {
-            console.log('尝试从整个文件内容中提取Cookie...');
-            const extractedCookies = extractCookiesFromText(fileContent);
-            extractedCookies.forEach(cookie => {
-              if (!cookies.includes(cookie)) {
-                cookies.push(cookie);
-              }
-            });
-            console.log(`从整个文件内容中提取到 ${cookies.length} 个Cookie`);
-          }
-          
           // 验证提取的cookie是否完整
           const validatedCookies = validateCookies(cookies);
           
@@ -105,10 +155,36 @@ async function extractCookiesFromCsv(csvFilePath) {
         })
         .on('error', (error) => {
           console.error('解析CSV文件时出错:', error);
-          // 如果解析出错，尝试从整个文件内容中提取
-          const extractedCookies = extractCookiesFromText(fileContent);
-          console.log(`解析出错后从文件内容中提取到 ${extractedCookies.length} 个Cookie`);
-          resolve(validateCookies(extractedCookies));
+          
+          // 如果已经提取到cookie，直接返回
+          if (cookies.length > 0) {
+            console.log(`解析出错但已提取到 ${cookies.length} 个Cookie，进行验证后返回`);
+            resolve(validateCookies(cookies));
+          } else {
+            // 否则尝试其他方法提取
+            console.log('尝试其他方法提取Cookie...');
+            
+            // 尝试提取JWT格式token
+            const jwtMatches = fileContent.match(jwtRegex);
+            if (jwtMatches) {
+              jwtMatches.forEach(match => {
+                if (!cookies.includes(match)) {
+                  cookies.push(match);
+                }
+              });
+            }
+            
+            // 尝试提取旧格式cookie
+            const oldFormatCookies = extractCookiesFromText(fileContent);
+            oldFormatCookies.forEach(cookie => {
+              if (!cookies.includes(cookie)) {
+                cookies.push(cookie);
+              }
+            });
+            
+            console.log(`通过其他方法提取到 ${cookies.length} 个Cookie`);
+            resolve(validateCookies(cookies));
+          }
         });
     } catch (error) {
       console.error('提取Cookie时出错:', error);
@@ -125,12 +201,24 @@ async function extractCookiesFromCsv(csvFilePath) {
 function extractCookiesFromText(text) {
   const cookies = [];
   
-  // 使用正则表达式匹配user_开头的cookie
-  const regex = /user_[a-zA-Z0-9%]+%3A%3A[a-zA-Z0-9%\.\_\-]+/g;
-  const matches = text.match(regex);
+  // 使用正则表达式匹配user_开头的cookie（旧格式）
+  const oldFormatRegex = /user_[a-zA-Z0-9%]+%3A%3A[a-zA-Z0-9%\.\_\-]+/g;
+  const oldFormatMatches = text.match(oldFormatRegex);
+  
+  if (oldFormatMatches) {
+    oldFormatMatches.forEach(match => {
+      if (!cookies.includes(match)) {
+        cookies.push(match);
+      }
+    });
+  }
+  
+  // 使用正则表达式匹配以ey开头的JWT格式cookie（新格式）
+  const jwtRegex = /ey[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
+  const jwtMatches = text.match(jwtRegex);
   
-  if (matches) {
-    matches.forEach(match => {
+  if (jwtMatches) {
+    jwtMatches.forEach(match => {
       if (!cookies.includes(match)) {
         cookies.push(match);
       }
@@ -146,23 +234,33 @@ function extractCookiesFromText(text) {
  * @returns {string[]} - 验证后的cookie数组
  */
 function validateCookies(cookies) {
-  return cookies.map(cookie => {
-    // 检查cookie是否包含JWT的三个部分（header.payload.signature）
-    if (cookie.includes('%3A%3A')) {
+  return cookies.filter(cookie => {
+    // 检查是否是新格式的JWT token (ey开头)
+    if (cookie.startsWith('ey') && cookie.includes('.')) {
+      const parts = cookie.split('.');
+      // 检查JWT是否包含三个部分
+      if (parts.length === 3) {
+        return true; // cookie有效
+      } else {
+        console.warn(`检测到不完整的JWT(新格式): ${cookie}`);
+        return false;
+      }
+    } 
+    // 检查旧格式cookie是否完整
+    else if (cookie.includes('%3A%3A')) {
       const parts = cookie.split('%3A%3A');
       if (parts.length === 2) {
         const jwt = parts[1];
         // 检查JWT是否包含两个点（表示三个部分）
         if (jwt.includes('.') && jwt.split('.').length === 3) {
-          return cookie; // cookie完整
+          return true; // cookie完整
         } else {
-          console.warn(`检测到不完整的JWT: ${cookie}`);
-          // 尝试修复不完整的JWT（如果可能）
-          return cookie;
+          console.warn(`检测到不完整的JWT(旧格式): ${cookie}`);
+          return false;
         }
       }
     }
-    return cookie;
+    return true; // 对于无法识别的格式，默认保留
   });
 }