Skip to content

Commit df67a2c

Browse files
committed
fix(playwright): only create adblocker if flag is true
1 parent d67b280 commit df67a2c

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/lib/server/websearch/scrape/playwright.ts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@ import { env } from "$env/dynamic/private";
1111
import { logger } from "$lib/server/logger";
1212
import { onExit } from "$lib/server/exitHandler";
1313

14-
const blocker = await PlaywrightBlocker.fromPrebuiltAdsAndTracking(fetch)
15-
.then((blker) => {
16-
const mostBlocked = blker.blockFonts().blockMedias().blockFrames().blockImages();
17-
if (env.WEBSEARCH_JAVASCRIPT === "false") return mostBlocked.blockScripts();
18-
return mostBlocked;
19-
})
20-
.catch((err) => {
21-
logger.error(err, "Failed to initialize PlaywrightBlocker from prebuilt lists");
22-
return PlaywrightBlocker.empty();
23-
});
14+
const blocker =
15+
env.PLAYWRIGHT_ADBLOCKER === "true"
16+
? await PlaywrightBlocker.fromPrebuiltAdsAndTracking(fetch)
17+
.then((blker) => {
18+
const mostBlocked = blker.blockFonts().blockMedias().blockFrames().blockImages();
19+
if (env.WEBSEARCH_JAVASCRIPT === "false") return mostBlocked.blockScripts();
20+
return mostBlocked;
21+
})
22+
.catch((err) => {
23+
logger.error(err, "Failed to initialize PlaywrightBlocker from prebuilt lists");
24+
return PlaywrightBlocker.empty();
25+
})
26+
: PlaywrightBlocker.empty();
2427

2528
let browserSingleton: Promise<Browser> | undefined;
2629
async function getBrowser() {
@@ -65,7 +68,7 @@ export async function withPage<T>(
6568

6669
try {
6770
const page = await ctx.newPage();
68-
process.env.PLAYWRIGHT_ADBLOCKER === "true" && (await blocker.enableBlockingInPage(page));
71+
env.PLAYWRIGHT_ADBLOCKER === "true" && (await blocker.enableBlockingInPage(page));
6972

7073
const res = await page.goto(url, { waitUntil: "load", timeout: 3500 }).catch(() => {
7174
console.warn(`Failed to load page within 2s: ${url}`);

0 commit comments

Comments
 (0)