z0rs
/
chromium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97 from Sparticuz/feature/chromium113

This commit is contained in:
Kyle McNally 2023-05-04 12:41:38 -04:00 committed by GitHub
parent 96f0556ba3 ccf85f2fdb
commit 2c2eebac1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/ISSUE_TEMPLATE/bug-report.md vendored
View File

@ -12,10 +12,11 @@ For Playwright-specific bugs, please refer to: https://github.com/microsoft/play
-->
## Environment
* `chromium` Version:
* `puppeteer` / `puppeteer-core` Version:
* Node.js Version: <!-- 14.x | 16.x -->
* Lambda / GCF Runtime: <!-- `nodejs8.10` | `nodejs10.x` | `nodejs12.x` -->
- `chromium` Version:
- `puppeteer` / `puppeteer-core` Version:
- Node.js Version: <!-- 16.x | 18.x -->
- Lambda / GCF Runtime: <!-- `nodejs16` | `nodejs18.x` -->
## Expected Behavior

1
.github/workflows/aws.yml vendored
View File

@ -43,7 +43,6 @@ jobs:
event:
- example.com
version:
- 14
- 16
- 18
steps:

12
_/amazon/template.yml
View File

@ -12,21 +12,9 @@ Resources:
LayerName: sparticuz-chromium
ContentUri: code/
CompatibleRuntimes:
- nodejs14.x
- nodejs16.x
- nodejs18.x
node14:
Type: AWS::Serverless::Function
Properties:
Layers:
- !Ref layer
Handler: handlers/index.handler
Runtime: nodejs14.x
Policies:
- AWSLambdaBasicExecutionRole
- AWSXRayDaemonWriteAccess
Tracing: Active
node16:
Type: AWS::Serverless::Function
Properties:

2
_/ansible/inventory.ini
View File

@ -14,4 +14,4 @@ instance_size=c6i.12xlarge
ansible_connection=ssh
ansible_python_interpreter=auto_silent
ansible_ssh_private_key_file=ansible.pem
chromium_revision=1108766
chromium_revision=1121455

0
bin/aws.tar.br Executable file → Normal file
View File

BIN
bin/chromium.br Executable file → Normal file
View File

Binary file not shown.

BIN
bin/swiftshader.tar.br Executable file → Normal file
View File

Binary file not shown.

33
package-lock.json generated
View File

@ -13,21 +13,28 @@
"tar-fs": "^2.1.1"
},
"devDependencies": {
"@tsconfig/node14": "^1.0.3",
"@tsconfig/node16": "^1.0.3",
"@tsconfig/strictest": "^2.0.1",
"@types/follow-redirects": "^1.14.1",
"@types/node": "^18.15.7",
"@types/node": "^18.16.3",
"@types/tar-fs": "^2.0.1",
"clean-modules": "^2.0.6",
"typescript": "^5.0.2"
"typescript": "^5.0.4"
},
"engines": {
"node": ">= 14.18.0"
"node": ">= 16"
}
},
"node_modules/@tsconfig/node14": {
"node_modules/@tsconfig/node16": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
"integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
"integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
"dev": true
},
"node_modules/@tsconfig/strictest": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@tsconfig/strictest/-/strictest-2.0.1.tgz",
"integrity": "sha512-7JHHCbyCsGUxLd0pDbp24yz3zjxw2t673W5oAP6HCEdr/UUhaRhYd3SSnUsGCk+VnPVJVA4mXROzbhI+nyIk+w==",
"dev": true
},
"node_modules/@types/follow-redirects": {
@ -40,9 +47,9 @@
}
},
"node_modules/@types/node": {
"version": "18.15.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
"integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
"version": "18.16.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz",
"integrity": "sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==",
"dev": true
},
"node_modules/@types/tar-fs": {
@ -537,9 +544,9 @@
}
},
"node_modules/yargs": {
"version": "17.6.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
"integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
"version": "17.7.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
"integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
"dev": true,
"dependencies": {
"cliui": "^8.0.1",

9
package.json
View File

@ -40,14 +40,15 @@
"tar-fs": "^2.1.1"
},
"devDependencies": {
"@tsconfig/node14": "^1.0.3",
"@tsconfig/node16": "^1.0.3",
"@tsconfig/strictest": "^2.0.1",
"@types/follow-redirects": "^1.14.1",
"@types/node": "^18.15.7",
"@types/node": "^18.16.3",
"@types/tar-fs": "^2.0.1",
"clean-modules": "^2.0.6",
"typescript": "^5.0.2"
"typescript": "^5.0.4"
},
"engines": {
"node": ">= 14.18.0"
"node": ">= 16"
}
}

4
source/helper.ts
View File

@ -23,8 +23,8 @@ export const isValidUrl = (input: string) => {
*/
export const isRunningInAwsLambda = () => {
if (
process.env.AWS_EXECUTION_ENV &&
/^AWS_Lambda_nodejs/.test(process.env.AWS_EXECUTION_ENV) === true
process.env["AWS_EXECUTION_ENV"] &&
/^AWS_Lambda_nodejs/.test(process.env["AWS_EXECUTION_ENV"]) === true
) {
return true;
}

31
source/index.ts
View File

@ -45,15 +45,20 @@ interface Viewport {
}
if (isRunningInAwsLambda()) {
if (process.env.FONTCONFIG_PATH === undefined) {
process.env.FONTCONFIG_PATH = "/tmp/aws";
if (process.env["FONTCONFIG_PATH"] === undefined) {
process.env["FONTCONFIG_PATH"] = "/tmp/aws";
}
if (process.env.LD_LIBRARY_PATH === undefined) {
process.env.LD_LIBRARY_PATH = "/tmp/aws/lib";
} else if (process.env.LD_LIBRARY_PATH.startsWith("/tmp/aws/lib") !== true) {
process.env.LD_LIBRARY_PATH = [
...new Set(["/tmp/aws/lib", ...process.env.LD_LIBRARY_PATH.split(":")]),
if (process.env["LD_LIBRARY_PATH"] === undefined) {
process.env["LD_LIBRARY_PATH"] = "/tmp/aws/lib";
} else if (
process.env["LD_LIBRARY_PATH"].startsWith("/tmp/aws/lib") !== true
) {
process.env["LD_LIBRARY_PATH"] = [
...new Set([
"/tmp/aws/lib",
...process.env["LD_LIBRARY_PATH"].split(":"),
]),
].join(":");
}
}
@ -77,12 +82,12 @@ class Chromium {
* Downloads or symlinks a custom font and returns its basename, patching the environment so that Chromium can find it.
*/
static font(input: string): Promise<string> {
if (process.env.HOME === undefined) {
process.env.HOME = "/tmp";
if (process.env["HOME"] === undefined) {
process.env["HOME"] = "/tmp";
}
if (existsSync(`${process.env.HOME}/.fonts`) !== true) {
mkdirSync(`${process.env.HOME}/.fonts`);
if (existsSync(`${process.env["HOME"]}/.fonts`) !== true) {
mkdirSync(`${process.env["HOME"]}/.fonts`);
}
return new Promise((resolve, reject) => {
@ -91,7 +96,7 @@ class Chromium {
}
const url = new URL(input);
const output = `${process.env.HOME}/.fonts/${url.pathname
const output = `${process.env["HOME"]}/.fonts/${url.pathname
.split("/")
.pop()}`;
@ -143,7 +148,7 @@ class Chromium {
*/
static get args(): string[] {
/**
* These are the default ares in puppeteer.
* These are the default args in puppeteer.
* https://github.com/puppeteer/puppeteer/blob/3a31070d054fa3cd8116ca31c578807ed8d6f987/packages/puppeteer-core/src/node/ChromeLauncher.ts#L185
*/
const puppeteerFlags = [

5
tsconfig.json
View File

@ -1,5 +1,8 @@
{
"extends": "@tsconfig/node14/tsconfig.json",
"extends": [
"@tsconfig/node16/tsconfig",
"@tsconfig/strictest"
],
"compilerOptions": {
"declaration": true,
"lib": [