Skip to content

Add proxy support #83

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
justtomu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add proxy support #83

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion src/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,13 @@ async function resolveChallenge(ctx: RequestContext, { url, maxTimeout, proxy, d
let message = ''

if (proxy) {
log.debug("Apply proxy");
const proxy_credentials = proxy.split('@').length > 0 ? proxy.split('@')[0]: null
if (proxy_credentials && proxy_credentials.includes(':')) {
await page.authenticate({
username: proxy_credentials.split(':')[0],
password: proxy_credentials.split(':')[1]
})
}
}

log.debug(`Navigating to... ${url}`)
Expand Down
11 changes: 8 additions & 3 deletions src/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ function prepareBrowserProfile(id: string): string {
export default {
create: async (id: string, { proxy, cookies, oneTimeSession, userAgent, headers, maxTimeout }: SessionCreateOptions): Promise<SessionsCacheItem> => {
let args = ['--no-sandbox', '--disable-setuid-sandbox'];
let proxy_without_credentials;
if (proxy) {
log.debug(proxy)
args.push(`--proxy-server=${proxy}`);
if (proxy.includes('@'))
proxy_without_credentials = proxy.split('@')[1]
else
proxy_without_credentials = proxy
args.push(`--proxy-server=${proxy_without_credentials}`);
}

const puppeteerOptions: LaunchOptions = {
Expand Down Expand Up @@ -104,7 +108,8 @@ export default {
defaults: removeEmptyFields({
userAgent,
headers,
maxTimeout
maxTimeout,
proxy
})
}

Expand Down