diff --git a/packages/adblocker-electron-example/index.ts b/packages/adblocker-electron-example/index.ts index 717104e048..304b221b92 100644 --- a/packages/adblocker-electron-example/index.ts +++ b/packages/adblocker-electron-example/index.ts @@ -2,7 +2,13 @@ import fetch from 'cross-fetch'; import { app, BrowserWindow } from 'electron'; import { readFileSync, writeFileSync } from 'fs'; -import { CosmeticFilter, ElectronBlocker, fullLists, Request } from '@cliqz/adblocker-electron'; +import { + CosmeticFilter, + ElectronBlocker, + fullLists, + NetworkFilter, + Request, +} from '@cliqz/adblocker-electron'; import { MatchingContext } from '@cliqz/adblocker/src/engine/engine'; function getUrlToLoad(): string { @@ -70,18 +76,25 @@ async function createWindow() { console.log('style', style.length, url, context); }); - blocker.on('scriptlet-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('script-matched', rule, context); + blocker.on('scriptlet-matched', (rule: CosmeticFilter) => { + console.log('script-matched', rule); }); - blocker.on('extended-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('extended-rule-matched', rule, context); + blocker.on('extended-rule-matched', (rule: CosmeticFilter) => { + console.log('extended-rule-matched', rule); }); - blocker.on('style-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('style-matched', rule, context); + blocker.on('style-rule-matched', (rule: CosmeticFilter) => { + console.log('style-matched', rule); }); + blocker.on( + 'filter-matched', + (filter: CosmeticFilter | NetworkFilter, context: MatchingContext) => { + console.log('filter-matched', filter, context); + }, + ); + mainWindow.loadURL(getUrlToLoad()); mainWindow.webContents.openDevTools(); diff --git a/packages/adblocker-playwright-example/index.ts b/packages/adblocker-playwright-example/index.ts index f5cfd38921..53141d740f 100644 --- a/packages/adblocker-playwright-example/index.ts +++ b/packages/adblocker-playwright-example/index.ts @@ -1,6 +1,7 @@ import { CosmeticFilter, fullLists, + NetworkFilter, PlaywrightBlocker, Request, } from '@cliqz/adblocker-playwright'; @@ -51,18 +52,25 @@ import * as pw from 'playwright'; console.log('style', url, style.length); }); - blocker.on('scriptlet-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('script-matched', rule, context); + blocker.on('scriptlet-matched', (rule: CosmeticFilter) => { + console.log('script-matched', rule); }); - blocker.on('extended-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('extended-rule-matched', rule, context); + blocker.on('extended-rule-matched', (rule: CosmeticFilter) => { + console.log('extended-rule-matched', rule); }); - blocker.on('style-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('style-matched', rule, context); + blocker.on('style-rule-matched', (rule: CosmeticFilter) => { + console.log('style-matched', rule); }); + blocker.on( + 'filter-matched', + (filter: CosmeticFilter | NetworkFilter, context: MatchingContext) => { + console.log('filter-matched', filter, context); + }, + ); + await page.goto('https://www.mangareader.net/'); await page.screenshot({ path: 'output.png' }); await blocker.disableBlockingInPage(page); diff --git a/packages/adblocker-puppeteer-example/index.ts b/packages/adblocker-puppeteer-example/index.ts index aced5527b2..4e70b7da8e 100644 --- a/packages/adblocker-puppeteer-example/index.ts +++ b/packages/adblocker-puppeteer-example/index.ts @@ -1,4 +1,10 @@ -import { CosmeticFilter, fullLists, PuppeteerBlocker, Request } from '@cliqz/adblocker-puppeteer'; +import { + CosmeticFilter, + fullLists, + NetworkFilter, + PuppeteerBlocker, + Request, +} from '@cliqz/adblocker-puppeteer'; import { MatchingContext } from '@cliqz/adblocker/src/engine/engine'; import { promises as fs } from 'fs'; import fetch from 'node-fetch'; @@ -64,17 +70,24 @@ function getUrlToLoad(): string { console.log('style', url, style.length, context); }); - blocker.on('scriptlet-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('script-matched', rule, context); + blocker.on('scriptlet-matched', (rule: CosmeticFilter) => { + console.log('script-matched', rule); }); - blocker.on('extended-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('extended-rule-matched', rule, context); + blocker.on('extended-rule-matched', (rule: CosmeticFilter) => { + console.log('extended-rule-matched', rule); }); - blocker.on('style-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('style-matched', rule, context); + blocker.on('style-rule-matched', (rule: CosmeticFilter) => { + console.log('style-matched', rule); }); + blocker.on( + 'filter-matched', + (filter: CosmeticFilter | NetworkFilter, context: MatchingContext) => { + console.log('filter-matched', filter, context); + }, + ); + await page.goto(getUrlToLoad()); })(); diff --git a/packages/adblocker-webextension-example/background.ts b/packages/adblocker-webextension-example/background.ts index e6a3278959..67ddf8fd65 100644 --- a/packages/adblocker-webextension-example/background.ts +++ b/packages/adblocker-webextension-example/background.ts @@ -13,6 +13,7 @@ import { CosmeticFilter, fullLists, HTMLSelector, + NetworkFilter, Request, WebExtensionBlocker, } from '@cliqz/adblocker-webextension'; @@ -100,17 +101,24 @@ WebExtensionBlocker.fromLists(fetch, fullLists, { console.log('style', url, style.length, context); }); - blocker.on('scriptlet-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('script-matched', rule, context); + blocker.on('scriptlet-matched', (rule: CosmeticFilter) => { + console.log('script-matched', rule); }); - blocker.on('extended-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('extended-rule-matched', rule, context); + blocker.on('extended-rule-matched', (rule: CosmeticFilter) => { + console.log('extended-rule-matched', rule); }); - blocker.on('style-rule-matched', (rule: CosmeticFilter, context: MatchingContext) => { - console.log('style-matched', rule, context); + blocker.on('style-rule-matched', (rule: CosmeticFilter) => { + console.log('style-matched', rule); }); + blocker.on( + 'filter-matched', + (filter: CosmeticFilter | NetworkFilter, context: MatchingContext) => { + console.log('filter-matched', filter, context); + }, + ); + console.log('Ready to roll!'); });