Merge pull request #973 from omnivore-app/fix/chrome-aws-lambda

Use chrome-aws-lambda in GCF
This commit is contained in:
Hongbo Wu
2022-07-16 12:57:16 +08:00
committed by GitHub
3 changed files with 56 additions and 29 deletions

View File

@ -23,6 +23,8 @@ const { pdfHandler } = require('./pdf-handler');
const { mediumHandler } = require('./medium-handler');
const { derstandardHandler } = require('./derstandard-handler');
const { imageHandler } = require('./image-handler');
const chromium = require('chrome-aws-lambda');
const puppeteer = require('puppeteer-core');
// Add stealth plugin to hide puppeteer usage
@ -124,35 +126,42 @@ const userAgentForUrl = (url) => {
// launch Puppeteer
const getBrowserPromise = (async () => {
return puppeteer.launch({
args: [
'--allow-running-insecure-content',
'--autoplay-policy=user-gesture-required',
'--disable-component-update',
'--disable-domain-reliability',
'--disable-features=AudioServiceOutOfProcess,IsolateOrigins,site-per-process',
'--disable-print-preview',
'--disable-setuid-sandbox',
'--disable-site-isolation-trials',
'--disable-speech-api',
'--disable-web-security',
'--disk-cache-size=33554432',
'--enable-features=SharedArrayBuffer',
'--hide-scrollbars',
'--ignore-gpu-blocklist',
'--in-process-gpu',
'--mute-audio',
'--no-default-browser-check',
'--no-pings',
'--no-sandbox',
'--no-zygote',
'--use-gl=swiftshader',
'--window-size=1920,1080',
].filter((item) => !!item),
defaultViewport: { height: 1080, width: 1920 },
executablePath: process.env.CHROMIUM_PATH,
headless: !!process.env.LAUNCH_HEADLESS,
timeout: 0,
args: chromium.args,
defaultViewport: chromium.defaultViewport,
executablePath: await chromium.executablePath,
headless: chromium.headless,
ignoreHTTPSErrors: true,
});
// return puppeteer.launch({
// args: [
// '--allow-running-insecure-content',
// '--autoplay-policy=user-gesture-required',
// '--disable-component-update',
// '--disable-domain-reliability',
// '--disable-features=AudioServiceOutOfProcess,IsolateOrigins,site-per-process',
// '--disable-print-preview',
// '--disable-setuid-sandbox',
// '--disable-site-isolation-trials',
// '--disable-speech-api',
// '--disable-web-security',
// '--disk-cache-size=33554432',
// '--enable-features=SharedArrayBuffer',
// '--hide-scrollbars',
// '--ignore-gpu-blocklist',
// '--in-process-gpu',
// '--mute-audio',
// '--no-default-browser-check',
// '--no-pings',
// '--no-sandbox',
// '--no-zygote',
// '--use-gl=swiftshader',
// '--window-size=1920,1080',
// ].filter((item) => !!item),
// defaultViewport: { height: 1080, width: 1920 },
// executablePath: process.env.CHROMIUM_PATH,
// headless: !!process.env.LAUNCH_HEADLESS,
// timeout: 0,
// });
})();
let logRecord, functionStartTime;

View File

@ -13,7 +13,7 @@
"jsonwebtoken": "^8.5.1",
"linkedom": "^0.14.9",
"luxon": "^2.3.1",
"puppeteer-core": "^15.3.2",
"puppeteer-core": "^15.4.0",
"winston": "^3.3.3"
},
"devDependencies": {

View File

@ -20890,6 +20890,24 @@ puppeteer-core@^15.3.2:
unbzip2-stream "1.4.3"
ws "8.8.0"
puppeteer-core@^15.4.0:
version "15.4.0"
resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-15.4.0.tgz#37536c973ea8920181effde47c22c67c36d1db21"
integrity sha512-nUu0aqeOsYnKJwKlHNNCU5cqVsJ+p1EPDzNRITcEV3n1Mz06Ev2DNsb7CTtGd6Sx2rjoseD6zZzEU7XZWocYwQ==
dependencies:
cross-fetch "3.1.5"
debug "4.3.4"
devtools-protocol "0.0.1011705"
extract-zip "2.0.1"
https-proxy-agent "5.0.1"
pkg-dir "4.2.0"
progress "2.0.3"
proxy-from-env "1.1.0"
rimraf "3.0.2"
tar-fs "2.1.1"
unbzip2-stream "1.4.3"
ws "8.8.0"
puppeteer@^10.1.0:
version "10.4.0"
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz#a6465ff97fda0576c4ac29601406f67e6fea3dc7"