From f837345f36c5c34a6bb8540e7a4259ab7d110e81 Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Sun, 24 Mar 2024 21:20:18 +0800
Subject: [PATCH] fix: remove require

---
 lib/utils/proxy/index.ts |  8 ++++----
 lib/utils/puppeteer.ts   | 25 +------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/lib/utils/proxy/index.ts b/lib/utils/proxy/index.ts
index b307f84cda..b49730693b 100644
--- a/lib/utils/proxy/index.ts
+++ b/lib/utils/proxy/index.ts
@@ -1,4 +1,7 @@
 import { config } from '@/config';
+import { PacProxyAgent } from 'pac-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { SocksProxyAgent } from 'socks-proxy-agent';
 
 const proxyIsPAC = config.pacUri || config.pacScript;
 
@@ -20,16 +23,13 @@ if (proxyIsPAC) {
     proxyUrlHandler = proxy.proxyUrlHandler;
 }
 
-let agent = null;
+let agent: PacProxyAgent<string> | HttpsProxyAgent<string> | SocksProxyAgent | null = null;
 if (proxyIsPAC) {
-    const { PacProxyAgent } = require('pac-proxy-agent');
     agent = new PacProxyAgent(`pac+${proxyUri}`);
 } else if (proxyUri) {
     if (proxyUri.startsWith('http')) {
-        const { HttpsProxyAgent } = require('https-proxy-agent');
         agent = new HttpsProxyAgent(proxyUri);
     } else if (proxyUri.startsWith('socks')) {
-        const { SocksProxyAgent } = require('socks-proxy-agent');
         agent = new SocksProxyAgent(proxyUri);
     }
 }
diff --git a/lib/utils/puppeteer.ts b/lib/utils/puppeteer.ts
index 9ad470f91e..24c3616324 100644
--- a/lib/utils/puppeteer.ts
+++ b/lib/utils/puppeteer.ts
@@ -2,8 +2,7 @@ import { config } from '@/config';
 import puppeteer from 'puppeteer';
 import logger from './logger';
 import proxy from './proxy';
-
-const proxyChain = require('proxy-chain');
+import proxyChain from 'proxy-chain';
 
 import { type PuppeteerExtra, addExtra } from 'puppeteer-extra';
 import StealthPlugin from 'puppeteer-extra-plugin-stealth';
@@ -27,28 +26,6 @@ const outPuppeteer = async (
     let insidePuppeteer: PuppeteerExtra | typeof puppeteer = puppeteer;
     if (extraOptions.stealth) {
         insidePuppeteer = addExtra(puppeteer);
-
-        // workaround for vercel/nft #54, #283, #304
-        require('puppeteer-extra-plugin-stealth/evasions/chrome.app');
-        require('puppeteer-extra-plugin-stealth/evasions/chrome.csi');
-        require('puppeteer-extra-plugin-stealth/evasions/chrome.loadTimes');
-        require('puppeteer-extra-plugin-stealth/evasions/chrome.runtime');
-        require('puppeteer-extra-plugin-stealth/evasions/defaultArgs');
-        require('puppeteer-extra-plugin-stealth/evasions/iframe.contentWindow');
-        require('puppeteer-extra-plugin-stealth/evasions/media.codecs');
-        require('puppeteer-extra-plugin-stealth/evasions/navigator.hardwareConcurrency');
-        require('puppeteer-extra-plugin-stealth/evasions/navigator.languages');
-        require('puppeteer-extra-plugin-stealth/evasions/navigator.permissions');
-        require('puppeteer-extra-plugin-stealth/evasions/navigator.plugins');
-        require('puppeteer-extra-plugin-stealth/evasions/navigator.vendor');
-        require('puppeteer-extra-plugin-stealth/evasions/navigator.webdriver');
-        require('puppeteer-extra-plugin-stealth/evasions/sourceurl');
-        require('puppeteer-extra-plugin-stealth/evasions/user-agent-override');
-        require('puppeteer-extra-plugin-stealth/evasions/webgl.vendor');
-        require('puppeteer-extra-plugin-stealth/evasions/window.outerdimensions');
-        require('puppeteer-extra-plugin-user-preferences');
-        require('puppeteer-extra-plugin-user-data-dir');
-
         insidePuppeteer.use(StealthPlugin());
     }