Skip to content

Fix #96 adding retry count option #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #96 adding retry count option #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/core/proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ const requestHandler = async (request, proxy, overrides = {}) => {
request.continue(); return;
}
const cookieHandler = new CookieHandler(request);
let retry = 1;
if (overrides.retry === 0 || overrides.retry) {
retry = overrides.retry
}

// Request options for GOT accounting for overrides
const options = {
cookieJar: await cookieHandler.getCookies(),
Expand All @@ -21,7 +26,9 @@ const requestHandler = async (request, proxy, overrides = {}) => {
maxRedirects: 15,
throwHttpErrors: false,
ignoreInvalidCookies: true,
followRedirect: false
followRedirect: false,
retry: retry

};
try {
const response = await got(overrides.url || request.url(), options);
Expand Down Expand Up @@ -75,12 +82,23 @@ const useProxyPer = {
},

// Call this if page object passed
CDPPage: async (page, proxy) => {
CDPPage: async (page, data) => {
await page.setRequestInterception(true);
const listener = "$ppp_requestListener";
removeRequestListener(page, listener);
let proxy, overrides;
// Separate proxy and overrides
if (type(data) === "object") {
if (Object.keys(data).length !== 0) {
proxy = data.proxy;
delete data.proxy;
overrides = data;
}
} else {
proxy = data
}
const f = {[listener]: async (request) => {
await requestHandler(request, proxy);
await requestHandler(request, proxy, overrides);
}};
if (proxy) {page.on("request", f[listener])}
else {await page.setRequestInterception(false)}
Expand All @@ -92,4 +110,4 @@ const useProxy = async (target, data) => {
useProxyPer[target.constructor.name](target, data);
};

module.exports = useProxy;
module.exports = useProxy;