From 610c790a7e74213d066c97f2cd087b457268f0a0 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 15 Jul 2022 11:09:57 +0800 Subject: [PATCH] do not use puppeteer-extra plugin --- packages/content-fetch/fetch-content.js | 9 +++++---- packages/content-fetch/package.json | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/content-fetch/fetch-content.js b/packages/content-fetch/fetch-content.js index 296215aa7..95ebafeb0 100644 --- a/packages/content-fetch/fetch-content.js +++ b/packages/content-fetch/fetch-content.js @@ -5,7 +5,7 @@ /* eslint-disable @typescript-eslint/no-require-imports */ require('dotenv').config(); const Url = require('url'); -const puppeteer = require('puppeteer-extra'); +const puppeteer = require('puppeteer-core'); const axios = require('axios'); const jwt = require('jsonwebtoken'); const { promisify } = require('util'); @@ -31,8 +31,8 @@ const ALLOWED_CONTENT_TYPES = ['text/html', 'application/octet-stream', 'text/pl const { parseHTML } = require('linkedom'); // Add stealth plugin to hide puppeteer usage -const StealthPlugin = require('puppeteer-extra-plugin-stealth'); -puppeteer.use(StealthPlugin()); +// const StealthPlugin = require('puppeteer-extra-plugin-stealth'); +// puppeteer.use(StealthPlugin()); const userAgentForUrl = (url) => { @@ -105,10 +105,11 @@ const getBrowserPromise = (async () => { '--no-zygote', '--use-gl=swiftshader', '--window-size=1920,1080', + process.env.LAUNCH_HEADLESS ? '--single-process' : '--start-maximized', ].filter((item) => !!item), defaultViewport: { height: 1080, width: 1920 }, executablePath: process.env.CHROMIUM_PATH , - headless: true, + headless: !!process.env.LAUNCH_HEADLESS, timeout: 0, }); })(); diff --git a/packages/content-fetch/package.json b/packages/content-fetch/package.json index 63f2b5e2e..62088e97b 100644 --- a/packages/content-fetch/package.json +++ b/packages/content-fetch/package.json @@ -10,9 +10,7 @@ "jsonwebtoken": "^8.5.1", "linkedom": "^0.14.9", "luxon": "^2.3.1", - "puppeteer-core": "^15.3.2", - "puppeteer-extra": "^3.2.3", - "puppeteer-extra-plugin-stealth": "^2.9.0" + "puppeteer-core": "^15.3.2" }, "scripts": { "start": "node app.js",