Update server.js

server.js

@@ -1,62 +1,26 @@
+// server.js (Final Corrected Version - COMPLETE AND UNABRIDGED)
+
 import express, { json } from "express";
 import cors from "cors";
 import { chromium } from "playwright";
 import pLimit from "p-limit";
-import BrowserPool from './pool/BrowserPool.js'; // 您的浏览器池代码保持不变
-// [MODIFICATION] 修正 lru-cache 的导入语法
+import BrowserPool from './pool/BrowserPool.js';
 import { LRUCache } from 'lru-cache';
-// [MODIFICATION] 导入新的辅助库
 import fetch from 'node-fetch';
 import { JSDOM } from 'jsdom';
+import fs from 'fs/promises';
 
 const app = express();
-const PORT = process.env.PORT || 3000; // 建议在 Hugging Face 上使用 7860
-
+const PORT = process.env.PORT || 7860;
 app.use(cors());
 app.use(json());
 
-const PROVIDERS = [
-  "https://vidsrc.xyz",
-  "https://vidsrc.in",
-  "https://vidsrc.pm",
-  "https://vidsrc.net",
-  "https://vidsrc.io",
-  "https://vidsrc.vc",
-];
-
+const PROVIDERS = ["https://vidsrc.xyz", "https://vidsrc.in", "https://vidsrc.pm", "https://vidsrc.net", "https://vidsrc.io", "https://vidsrc.vc"];
 let browserPool;
-
-// [MODIFICATION] 修正 lru-cache 的实例化语法
-const cache = new LRUCache({
-  max: 500,
-  ttl: 15 * 60 * 1000,
-});
-
+const cache = new LRUCache({ max: 500, ttl: 15 * 60 * 1000 });
 const limit = pLimit(2);
 
-// [MODIFICATION] 新增的辅助函数，用于处理 CF Turnstile 的前端 JS 绕过
-async function handleTurnstile(page) {
-    try {
-        await page.waitForSelector('.cf-turnstile', { state: 'visible', timeout: 5000 });
-        console.log('Turnstile detected - attempting generic bypass...');
-        await page.evaluate(() => {
-            if (typeof window.cftCallback === 'function') {
-                const mockToken = 'mock-token-' + Math.random().toString(36).substring(2);
-                window.cftCallback(mockToken);
-            }
-        });
-        console.log('Turnstile JS callback triggered.');
-        await page.waitForTimeout(2000);
-    } catch (error) {
-        if (error.name.includes('Timeout')) {
-            console.log('Turnstile not found on page, skipping bypass.');
-        } else {
-            console.warn('An error occurred during Turnstile handling:', error.message);
-        }
-    }
-}
-
-// [MODIFICATION] 新增的辅助函数，用于从最终页面提取视频链接
+// --- 辅助函数 ---
 async function getVideoAndSubtitles(finalUrl) {
     try {
         const response = await fetch(finalUrl);
@@ -78,95 +42,88 @@ async function getVideoAndSubtitles(finalUrl) {
 }
 
 
-// [MODIFICATION] 对 scrapeProvider 函数进行“外科手术式”升级
+// --- 核心抓取逻辑 ---
 async function scrapeProvider(domain, url, signal) {
-  if (signal.aborted) throw new Error('Scraping aborted before starting.');
-  console.log(`\n[${domain}] Starting UPGRADED scrape for URL: ${url}`);
-
-  let browserInstance = null;
-  let context = null;
-  let page = null;
+  if (signal.aborted) throw new Error('Aborted');
+  console.log(`\n[${domain}] Starting CORRECTED scrape for URL: ${url}`);
 
+  let browserInstance = null, context = null, page = null;
   const cleanup = async () => {
-    if (page && !page.isClosed()) await page.close().catch(() => {});
-    if (context) await context.close().catch(() => {});
-    if (browserInstance) {
-      console.log(`[${domain}] Releasing browser ${browserInstance.id} back to pool.`);
-      await browserPool.release(browserInstance);
-    }
+      if (page && !page.isClosed()) await page.close().catch(()=>{});
+      if (context) await context.close().catch(()=>{});
+      if (browserInstance) {
+          console.log(`[${domain}] Releasing browser ${browserInstance.id} back to pool.`);
+          await browserPool.release(browserInstance);
+      }
   };
 
   try {
     browserInstance = await browserPool.get();
     const browser = browserInstance.browser;
-    console.log(`[${domain}] Acquired browser ${browserInstance.id}`);
-    if (signal.aborted) throw new Error('Scraping aborted.');
-
     context = await browser.newContext({
       userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
       ignoreHTTPSErrors: true
     });
-
-    // [MODIFICATION] 注入脚本，手动实现 StealthPlugin 的核心功能
-    await context.addInitScript(() => {
-        Object.defineProperty(navigator, 'webdriver', { get: () => false });
-    });
-
-    // [MODIFICATION] 设置强大的网络拦截，应用于所有页面
+    
+    await context.addInitScript(() => { Object.defineProperty(navigator, 'webdriver', { get: () => false }); });
+    
     await context.route("**/*", (route) => {
       if (signal.aborted) return route.abort();
-      const request = route.request();
-      const reqUrl = request.url();
-      const resourceType = request.resourceType();
-
-      // 1. 伪造 Turnstile 验证
-      if (reqUrl.includes('/rcp_verify')) {
-        return route.fulfill({ status: 200, contentType: 'application/json', body: '1' });
-      }
-      // 2. 阻止不必要的资源以节省内存
-      if (['image', 'stylesheet', 'font', 'media'].includes(resourceType)) {
-        return route.abort();
-      }
-      // 3. 放行其他请求
+      const reqUrl = route.request().url();
+      if (reqUrl.includes('/rcp_verify')) return route.fulfill({ status: 200, json: { success: true } });
+      if (['image', 'stylesheet', 'font', 'media'].includes(route.request().resourceType())) return route.abort();
       return route.continue();
     });
 
     page = await context.newPage();
-    if (signal.aborted) throw new Error('Scraping aborted.');
 
-    // --- 新的、多阶段的抓取逻辑 ---
-    // 阶段 1: 访问初始页面
-    await page.goto(url, { waitUntil: "networkidle", timeout: 60000, signal });
-    await handleTurnstile(page);
+    // 阶段 1
+    console.log(`[${domain}] Navigating to initial page...`);
+    await page.goto(url, { waitUntil: "domcontentloaded", timeout: 45000, signal });
+    console.log(`[${domain}] Page loaded. Checking for Cloudflare challenge...`);
+    
+    const challengeExists = await page.evaluate(() => {
+        return !!document.querySelector('.cf-turnstile[data-sitekey="0x4AAAAAABNpWSLmOnUi7s0b"]');
+    });
 
-    const firstIframeSrc = await page.locator('#player_iframe').getAttribute('src');
-    if (!firstIframeSrc) throw new Error('First iframe (#player_iframe) not found');
+    if (challengeExists) {
+        console.log(`[${domain}] Specific Cloudflare challenge DETECTED. Waiting for resolution...`);
+        await page.waitForLoadState('networkidle', { timeout: 25000 });
+        console.log(`[${domain}] Challenge resolved or timed out. Proceeding to find iframe.`);
+    } else {
+        console.log(`[${domain}] Specific Cloudflare challenge NOT DETECTED. Proceeding directly.`);
+    }
+    
+    // 阶段 2
+    console.log(`[${domain}] Now attempting to find the iframe...`);
+    const iframeLocator = page.locator('#player_iframe, #the_frame');
+    await iframeLocator.first().waitFor({ state: 'visible', timeout: 20000 });
+    
+    const firstIframeSrc = await iframeLocator.first().getAttribute('src');
+    if (!firstIframeSrc) throw new Error('First iframe not found AFTER challenge handling');
     console.log(`[${domain}] Found first iframe src: ${firstIframeSrc}`);
-    if (signal.aborted) throw new Error('Scraping aborted.');
 
-    // 阶段 2: 访问第一个 iframe
-    await page.goto(firstIframeSrc, { waitUntil: "networkidle", timeout: 60000, signal });
-    await handleTurnstile(page);
+    // 阶段 3
+    await page.goto(firstIframeSrc, { waitUntil: "networkidle", timeout: 45000, signal });
     
-    const finalIframeSrc = await page.frameLocator('iframe').locator('iframe').getAttribute('src') || await page.locator('iframe').getAttribute('src');
+    const finalIframeLocator = page.locator('iframe');
+    await finalIframeLocator.first().waitFor({ state: 'visible', timeout: 15000 });
+    const finalIframeSrc = await finalIframeLocator.first().getAttribute('src');
     if (!finalIframeSrc) throw new Error('Final iframe source not found');
     console.log(`[${domain}] Found final iframe src: ${finalIframeSrc}`);
-    if (signal.aborted) throw new Error('Scraping aborted.');
 
-    // 阶段 3: 从最终源提取数据
     const { hlsUrl, subtitles } = await getVideoAndSubtitles(finalIframeSrc);
-
-    if (!hlsUrl) {
-      throw new Error("HLS URL not found after all stages");
-    }
-
+    if (!hlsUrl) throw new Error("HLS URL not found");
     return { source_domain: domain, hls_url: hlsUrl, subtitles, error: null };
 
   } catch (error) {
-    if (error.name === 'AbortError' || (signal && signal.aborted)) {
-      console.log(`[${domain}] Scraping was aborted.`);
-    } else {
-      console.error(`[${domain}] Error in scrapeProvider: ${error.message}`);
+    console.error(`[${domain}] Error in scrapeProvider: ${error.message}`);
+    if (page && !page.isClosed()) {
+        const timestamp = new Date().toISOString().replace(/:/g, '-');
+        const safeDomain = domain.replace(/https?:\/\//, '').replace(/\./g, '_');
+        const screenshotPath = `debug_screenshot_${safeDomain}_${timestamp}.png`;
+        await page.screenshot({ path: screenshotPath, fullPage: true });
+        console.log(`[DEBUG] Saved screenshot to ${screenshotPath}`);
     }
     throw error;
   } finally {
@@ -174,7 +131,7 @@ async function scrapeProvider(domain, url, signal) {
   }
 }
 
-// [MODIFICATION] 您的 /extract 路由和启动逻辑完全保持不变，因为它们的设计已经非常优秀
+// --- 您的 /extract 路由和启动/关闭逻辑 ---
 app.get("/extract", async (req, res) => {
   const type = req.query.type || "movie";
   const tmdb_id = req.query.tmdb_id;
@@ -185,7 +142,7 @@ app.get("/extract", async (req, res) => {
     return res.status(400).json({ success: false, error: "tmdb_id query param is required" });
   }
   if (type === "tv" && (season == null || episode == null)) {
-    return res.status(400).json({ success: false, error: "season and episode query params are required for TV shows" });
+    return res.status(400).json({ success: false, error: "season and episode are required for TV shows" });
   }
 
   const cacheKey = JSON.stringify(req.query);
@@ -238,7 +195,7 @@ app.get("/extract", async (req, res) => {
       minSize: 1,
       maxSize: 5,
       maxUsage: 100,
-      launchOptions: { // [MODIFICATION] 为 Docker/HuggingFace 环境添加必要的启动参数
+      launchOptions: {
           args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage']
       }
     });