Skip to content

Commit f29cddb

Browse files
authored
Merge pull request #13 from tekliner/master
Make REST support proxy_server env too
2 parents 011f952 + beaca98 commit f29cddb

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

API/REST/Screenshot.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ if (maxConcurrency < 1){
1010
}
1111

1212
exports.handler = async (event, context, callback) => {
13-
13+
1414
var sharedmem = context.sharedmem;
1515
var beginPipeline = process.hrtime();
16-
16+
var proxy_server = process.env.PROXY_SERVER;
17+
1718
if ( hardcodedAPIKey != "" && event.queryStringParameters.apiKey != hardcodedAPIKey ){
1819
callback(null, {
1920
status: 400,
2021
content: "Invalid API Key"
2122
});
2223
return;
23-
}
24+
}
2425

2526
while ( sharedmem.getInteger("nbPuppeteerProcess") >= maxConcurrency ){
2627
await tools.sleep(20);
@@ -44,13 +45,13 @@ exports.handler = async (event, context, callback) => {
4445

4546
//var screenshotResult = await tools.screnshotForUrl(url, isFullPage, resX, resY, outFormat);
4647
var screenshotResult = null;
47-
48-
try{
49-
screenshotResult = await tools.screnshotForUrlTab(url, isFullPage, resX, resY, outFormat, waitTime);
48+
49+
try{
50+
screenshotResult = await tools.screnshotForUrlTab(url, isFullPage, resX, resY, outFormat, waitTime, proxy_server);
5051
}
5152
catch(ex){
5253
//do nothing
53-
54+
5455
}
5556

5657
sharedmem.incInteger("nbPuppeteerProcess", -1);
@@ -64,11 +65,11 @@ exports.handler = async (event, context, callback) => {
6465
data: "",
6566
mimeType: ""
6667
}
67-
}
68+
}
6869

6970
callback(null, {
7071
status: 200,
71-
content: screenshotResult.data,
72+
content: screenshotResult.data,
7273
details: screenshotResult.details,
7374
headers:{
7475
"execTime": durationMS.toFixed(2) + "ms",

0 commit comments

Comments
 (0)