Pull out the aws lambda check into it's own function

This commit is contained in:
Sparticuz 2023-03-27 08:46:00 -04:00
parent e0a6b12631
commit 38e10469c5
2 changed files with 7 additions and 9 deletions

View File

@ -17,6 +17,10 @@ export const isValidUrl = (input: string) => {
} }
}; };
export const isRunningInAwsLambda = () =>
process.env.AWS_EXECUTION_ENV &&
/^AWS_Lambda_nodejs/.test(process.env.AWS_EXECUTION_ENV) === true;
export const downloadAndExtract = async (url: string) => export const downloadAndExtract = async (url: string) =>
new Promise<string>((resolve, reject) => { new Promise<string>((resolve, reject) => {
const getOptions = parse(url) as FollowRedirOptions; const getOptions = parse(url) as FollowRedirOptions;

View File

@ -9,7 +9,7 @@ import { https } from "follow-redirects";
import LambdaFS from "./lambdafs"; import LambdaFS from "./lambdafs";
import { join } from "node:path"; import { join } from "node:path";
import { URL } from "node:url"; import { URL } from "node:url";
import { downloadAndExtract, isValidUrl } from "./helper"; import { downloadAndExtract, isRunningInAwsLambda, isValidUrl } from "./helper";
/** Viewport taken from https://github.com/puppeteer/puppeteer/blob/main/docs/api/puppeteer.viewport.md */ /** Viewport taken from https://github.com/puppeteer/puppeteer/blob/main/docs/api/puppeteer.viewport.md */
interface Viewport { interface Viewport {
@ -44,10 +44,7 @@ interface Viewport {
hasTouch?: boolean; hasTouch?: boolean;
} }
if ( if (isRunningInAwsLambda()) {
process.env.AWS_EXECUTION_ENV !== undefined &&
/^AWS_Lambda_nodejs/.test(process.env.AWS_EXECUTION_ENV) === true
) {
if (process.env.FONTCONFIG_PATH === undefined) { if (process.env.FONTCONFIG_PATH === undefined) {
process.env.FONTCONFIG_PATH = "/tmp/aws"; process.env.FONTCONFIG_PATH = "/tmp/aws";
} }
@ -295,10 +292,7 @@ class Chromium {
promises.push(LambdaFS.inflate(`${input}/swiftshader.tar.br`)); promises.push(LambdaFS.inflate(`${input}/swiftshader.tar.br`));
} }
if ( if (isRunningInAwsLambda()) {
process.env.AWS_EXECUTION_ENV !== undefined &&
/^AWS_Lambda_nodejs/.test(process.env.AWS_EXECUTION_ENV) === true
) {
promises.push(LambdaFS.inflate(`${input}/aws.tar.br`)); promises.push(LambdaFS.inflate(`${input}/aws.tar.br`));
} }