Update server.js

server.js

@@ -1,13 +1,8 @@
 const express = require('express');
 const path = require('path');
 const fs = require('fs');
-const cors = require("cors")
-const cookieParser = require('cookie-parser')
-const puppeteer = require('puppeteer-extra');
-const StealthPlugin = require('puppeteer-extra-plugin-stealth');
-const fetch = require("node-fetch");
 
-puppeteer.use(StealthPlugin());
+const puppeteer = require('puppeteer-core');
 
 const app = express();
 const PORT = 7860;
@@ -15,7 +10,7 @@ const PORT = 7860;
 // 中间件
 app.use(express.json({ limit: '40mb' }));
 app.use(express.static('.'));
-app.use(cors());
+
 // CORS支持
 app.use((req, res, next) => {
     res.header('Access-Control-Allow-Origin', '*');
@@ -93,187 +88,199 @@ app.get('/location', async (req, res) => {
     }
 });
 
+async function captureGDrivePayloadAndCookie(url, opts = {}) {
+  const {
+    chromePath = '/opt/google/chrome/chrome',
+    headless = 'new',
+    buttonSelector = '#gdriveButton',
+    fallbackSelector = '.google-download',
+    waitForButtonMs = 60000,
+    waitForPostMs = 20000,
+  } = opts;
+
+  let browser = null;
+  let page = null;
 
-async function captureHTML(url) {
-  let browser;
   try {
     browser = await puppeteer.launch({
-      executablePath: "/opt/google/chrome/chrome", // adjust if needed
-      headless: "new",
-      args: ['--disable-gpu', '--no-sandbox', '--disable-setuid-sandbox', '--ignoreHTTPSErrors'],
+      executablePath: chromePath,
+      headless,
+      args: [
+        '--no-sandbox',
+        '--disable-setuid-sandbox',
+        '--disable-web-security',
+        '--disable-gpu',
+        '--no-zygote',
+      ],
     });
 
-    const page = await browser.newPage();
+    page = await browser.newPage();
 
+    await page.setViewport({ width: 1280, height: 900 });
     await page.setUserAgent(
-      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
-        "(KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
+      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 ' +
+        '(KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36'
     );
 
     await page.evaluateOnNewDocument(() => {
-      Object.defineProperty(navigator, "webdriver", { get: () => false });
-      Object.defineProperty(navigator, "plugins", { get: () => [1, 2, 3] });
-      Object.defineProperty(navigator, "languages", { get: () => ["en-US", "en"] });
+      Object.defineProperty(navigator, 'webdriver', { get: () => false });
+      Object.defineProperty(navigator, 'plugins', { get: () => [1, 2, 3] });
+      Object.defineProperty(navigator, 'languages', { get: () => ['en-US', 'en'] });
       window.chrome = { runtime: {} };
     });
 
-    await page.evaluateOnNewDocument(() => {
-      const metas = document.getElementsByTagName("meta");
-      for (let i = metas.length - 1; i >= 0; i--) {
-        if (metas[i].httpEquiv && metas[i].httpEquiv.toLowerCase() === "refresh") {
-          metas[i].remove();
-        }
-      }
-    });
-
     await page.setRequestInterception(true);
-    page.on("request", (request) => {
-      const reqUrl = request.url();
-      if (reqUrl.includes("disable-devtool") || reqUrl.includes("shoagloumtoamir.net")) {
-        request.abort();
-      } else {
-        request.continue();
-      }
+    page.on('request', (req) => {
+      const rt = req.resourceType();
+      if (['image', 'stylesheet', 'font', 'media'].includes(rt)) req.abort();
+      else req.continue();
     });
 
-    await page.goto(url, { waitUntil: "load", timeout: 60000 });
-
-    await page.waitForNetworkIdle();
+    await page.goto(url, { waitUntil: 'load', timeout: 60000 });
 
-    const html = await page.content();
-
-    await browser.close();
-    return html
-  } catch (e) {
-    if (browser) await browser.close();
-    console.error(e);
-    throw e;
-  }
-}
-
-app.get("/api/bypass", async (req, res) => {
-  const { url } = req.query;
-  if (!url) {
-    return res.status(400).json({ error: "URL is required" });
-  }
+    await page.waitForFunction(() => document.readyState === 'complete', { timeout: 30000 }).catch(() => { /* ignore */ });
 
-  try {
-    const html = await captureHTML(url);
-    res.setHeader("Content-Type", "text/html; charset=utf-8");
-    res.send(html);
-  } catch (err) {
-    res.status(500).json({ error: "Failed to capture HTML" });
-  }
-});
+    let foundSelector = null;
+    try {
+      console.log('⏳ Waiting for primary selector:', buttonSelector);
+      await page.waitForSelector(buttonSelector, { visible: true, timeout: waitForButtonMs });
+      foundSelector = buttonSelector;
+    } catch (errPrimary) {
+      console.log('primary selector not found, trying fallback:', fallbackSelector);
+      try {
+        await page.waitForSelector(fallbackSelector, { visible: true, timeout: Math.max(5000, waitForButtonMs / 4) });
+        foundSelector = fallbackSelector;
+      } catch (errFallback) {
+        throw new Error(`Button not found using selectors "${buttonSelector}" or "${fallbackSelector}"`);
+      }
+    }
 
-async function capturetokenandcookies(url) {
-  let browser;
-  try {
-    browser = await puppeteer.launch({
-        executablePath: '/opt/google/chrome/chrome',
-        headless: 'new',
-        args: [
-          '--no-sandbox',
-          '--disable-setuid-sandbox',
-          '--disable-gpu',
-          '--no-zygote',
-        ],
-    });
+    console.log('✅ Found button selector:', foundSelector);
 
-    const page = await browser.newPage();
-    await page.setViewport({ width: 1280, height: 800 });
-    await page.setUserAgent(
-      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36'
+    const postRequestPromise = page.waitForRequest(
+      (req) => {
+        try {
+          if (req.method() !== 'POST') return false;
+          const body = req.postData() || '';
+          if (body.includes('"gdrive"') || body.includes('gdrive') || /token\s*[:=]/i.test(body)) return true;
+        } catch (e) {
+        }
+        return false;
+      },
+      { timeout: waitForPostMs }
     );
-    
-    await page.evaluateOnNewDocument(() => {
-      Object.defineProperty(navigator, 'webdriver', { get: () => false });
-      Object.defineProperty(navigator, 'plugins', { get: () => [1, 2, 3] });
-      Object.defineProperty(navigator, 'languages', { get: () => ['en-US', 'en'] });
-      window.chrome = { runtime: {} };
-    });
 
-    await page.evaluateOnNewDocument(() => {
-      const metas = document.getElementsByTagName('meta');
-      for (let i = metas.length - 1; i >= 0; i--) {
-        if (metas[i].httpEquiv && metas[i].httpEquiv.toLowerCase() === 'refresh') {
-          metas[i].remove();
-        }
+    await page.evaluate((sel) => {
+      const el = document.querySelector(sel);
+      if (el) {
+        el.scrollIntoView({ behavior: 'auto', block: 'center', inline: 'center' });
       }
-    });
+    }, foundSelector);
 
-await page.setRequestInterception(true);
-
-page.on("request", (req) => {
-  const reqUrl = req.url();
-  if (
-    reqUrl.includes("disable-devtool") ||
-    reqUrl.includes("shoagloumtoamir.net") ||
-    ["image", "stylesheet", "font", "media"].includes(req.resourceType())
-  ) {
-    req.abort();
-  } else {
-    req.continue();
-  }
-});
+    await page.click(foundSelector);
 
-    let capturedRequest = null;
-    page.on('request', (request) => {
-      if (request.method() === 'POST' && !capturedRequest) {
-        capturedRequest = {
-          url: request.url(),
-          headers: request.headers(),
-          body: request.postData(),
-        };
-      }
-    });
+    let matchedRequest;
+    try {
+      matchedRequest = await postRequestPromise;
+    } catch (err) {
+      // no post captured
+      throw new Error('Timed out waiting for POST request after clicking the button');
+    }
 
-    await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 60000 });
+    const headers = matchedRequest.headers() || {};
+    const cookieHeader = headers.cookie || null;
+    const rawBody = matchedRequest.postData() || '';
 
-    const buttons = ['#gdriveButton'];
-    for (const selector of buttons) {
+    let parsedPayload = null;
+    try {
+      parsedPayload = JSON.parse(rawBody);
+    } catch (e) {
       try {
-        await page.waitForSelector(selector, { timeout: 8000 });
-        await Promise.all([
-          page.waitForNetworkIdle(),
-          page.click(selector),
-        ]);
-        await page.waitForTimeout(3000);
-        if (capturedRequest) break;
-      } catch {}
+        const params = new URLSearchParams(rawBody);
+        if ([...params].length > 0) {
+          parsedPayload = {};
+          for (const [k, v] of params.entries()) parsedPayload[k] = v;
+        } else {
+          parsedPayload = { raw: rawBody };
+        }
+      } catch (e2) {
+        parsedPayload = { raw: rawBody };
+      }
     }
 
-    if (!capturedRequest) {
-      await page.close();
-      process.exit()
+    await page.close();
+    await browser.close();
+
+    return {
+      success: true,
+      cookies: cookieHeader,
+      token: parsedPayload.token,
+      requestUrl: matchedRequest.url(),
+    };
+  } catch (err) {
+    console.error('captureGDrivePayloadAndCookie error:', err.message || err);
+    if (page) {
+      try { await page.close(); } catch {}
+    }
+    if (browser) {
+      try { await browser.close(); } catch {}
     }
+    return { success: false, error: String(err.message || err) };
+  }
+}
 
-    let token = null;
-    try {
-      const bodyJson = JSON.parse(capturedRequest.body);
-      token = bodyJson.token || null;
-    } catch {}
+app.get('/api/bypass', async (req, res) => {
+  const { url } = req.query;
+  if (!url) return res.status(400).json({ error: 'URL is required' });
 
-    const cookies = capturedRequest.headers.cookie || null;
+  try {
+    const result = await captureGDrivePayloadAndCookie(url, {
+      chromePath: '/opt/google/chrome/chrome',
+      headless: 'new',
+      buttonSelector: '#gdriveButton',
+      fallbackSelector: '.google-download',
+      waitForButtonMs: 60000,
+      waitForPostMs: 20000,
+    });
 
-    await page.close();
+    if (!result.success) {
+      return res.status(500).json({ error: result.error || 'failed' });
+    }
 
-    return { token, cookies };
-  } catch (e) {
-    if (browser) await browser.close();
-    console.log(e)
-    process.exit(1)
+    return res.json({
+      cookie: result.cookieHeader,
+      payload: result.payload,
+      requestUrl: result.requestUrl,
+    });
+  } catch (err) {
+    console.error('/api/bypass error:', err);
+    return res.status(500).json({ error: 'Internal error' });
   }
-}
+});
 
 app.get('/api/cinex', async (req, res) => {
   const { url } = req.query;
   if (!url) {
     return res.status(400).json({ error: 'URL is required' });
   }
+const result = await captureGDrivePayloadAndCookie(url, {
+      chromePath: '/opt/google/chrome/chrome',
+      headless: 'new',
+      buttonSelector: '#gdriveButton',
+      fallbackSelector: '.google-download',
+      waitForButtonMs: 60000,
+      waitForPostMs: 20000,
+    });
+
+    if (!result.success) {
+      return res.status(500).json({ error: result.error || 'failed' });
+    }
 
-  const result = await capturetokenandcookies(url);
-  res.json(result);
+    return res.json({
+      cookie: result.cookieHeader,
+      payload: result.payload,
+      requestUrl: result.requestUrl,
+    });
 });