opelly/streetmerchant
1
0
Fork 0
mirror of https://github.com/opelly27/streetmerchant.git synced 2026-05-20 08:47:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert: allow users to still use USER_AGENT

Browse Source 
Removed from documentation, but older users can utilize
until fully removed in 4.0.0
This commit is contained in:
Jef LeCompte
2020-12-11 02:50:04 -05:00
parent 7bfcc81fdc
commit 3386e8f50d
5 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util.ts
+16 -3
View File
@@ -58,7 +58,7 @@ export async function usingPage<T>(
): Promise<T> {
const page = await browser.newPage();
page.setDefaultNavigationTimeout(config.page.timeout);
await page.setUserAgent(await getRandomUserAgent(browser));
await page.setUserAgent(await getRandomUserAgent());
try {
return await cb(page, browser);
@@ -79,11 +79,24 @@ export async function closePage(page: Page) {
await page.close();
}
export async function getRandomUserAgent(browser: Browser): Promise<string> {
export async function getRandomUserAgent(): Promise<string> {
const deprecatedUserAgent = (process.env.USER_AGENT
? process.env.USER_AGENT.includes('\n')
? process.env.USER_AGENT.split('\n')
: process.env.USER_AGENT.split(',')
: []
).map((s) => s.trim());
if (deprecatedUserAgent.length > 0) {
return deprecatedUserAgent[
Math.floor(Math.random() * deprecatedUserAgent.length)
];
}
const userAgent =
getRandom((ua) => {
return ua.browserName === 'Chrome' && ua.browserVersion > '20';
}) ?? (await browser.userAgent());
}) ?? config.browser.userAgent;
logger.debug('user agent', userAgent);