github/FlareSolverr
1
1
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2025-06-08 12:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backporting from YGGFetch (#1)

Browse Source
This commit is contained in:
Guisch 2020-06-21 20:10:56 +02:00 committed by GitHub
parent 77a68fd16a
commit 09ea2fa534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
index.js
View File

@ -2,7 +2,7 @@ const log = require('console-log-level')(
{ {
level: process.env.LOG_LEVEL || 'info', level: process.env.LOG_LEVEL || 'info',
prefix: function (level) { prefix: function (level) {
return new Date().toISOString() + " " + level.toUpperCase(); return reqCounter.toString() + " " + new Date().toISOString() + " " + level.toUpperCase();
} }
}); });
const puppeteer = require('puppeteer-extra'); const puppeteer = require('puppeteer-extra');
@ -18,10 +18,13 @@ const logHtml = process.env.LOG_HTML || false;
// in each request. we set the user-agent in the browser args instead // in each request. we set the user-agent in the browser args instead
puppeteer.use(StealthPlugin()); puppeteer.use(StealthPlugin());
// Help logging
var reqCounter = 0;
http.createServer(function(req, res) { http.createServer(function(req, res) {
reqCounter++;
const startTimestamp = Date.now(); const startTimestamp = Date.now();
log.info('Incoming request: ' + req.method + " " + req.url); log.info('Incoming request: ' + req.method + " " + req.url);
var body = []; var body = [];
req.on('data', function(chunk) { req.on('data', function(chunk) {
body.push(chunk); body.push(chunk);
@ -110,7 +113,7 @@ function processRequest(params, req, res, startTimestamp) {
} catch (error) { } catch (error) {
errorResponse(error.message, res, startTimestamp); errorResponse(error.message, res, startTimestamp);
} finally { } finally {
//await browser.close(); await browser.close();
} }
}).catch(error => { }).catch(error => {
errorResponse(error.message, res, startTimestamp); errorResponse(error.message, res, startTimestamp);
@ -122,6 +125,12 @@ async function resolveCallenge(params, browser, res, startTimestamp) {
const userAgent = await page.evaluate(() => navigator.userAgent); const userAgent = await page.evaluate(() => navigator.userAgent);
log.debug("User-Agent: " + userAgent); log.debug("User-Agent: " + userAgent);
const reqUrl = params["url"]; const reqUrl = params["url"];
const reqCookies = params["cookies"];
if (reqCookies) {
log.debug('Applying cookies');
await page.setCookie(...reqCookies);
}
log.debug("Navegating to... " + reqUrl); log.debug("Navegating to... " + reqUrl);
await page.goto(reqUrl, {waitUntil: 'networkidle0'}); await page.goto(reqUrl, {waitUntil: 'networkidle0'});