Adds support for using the puppeteer browser cache enabled when request interception is enabled #1885
Conversation
…uest interception is enabled.
Tyler-Murphy
changed the title
| @@ -62,7 +62,7 @@ export class BlockingContext { | |||
| this.onRequest = (request) => blocker.onRequest(request); | |||
| } | |||
|
|
|||
| public async enable(): Promise<void> { | |||
| public async enable({ cacheSafe }: { cacheSafe: boolean }): Promise<void> { | |||
There was a problem hiding this comment.
Let's maybe set the default value here instead of enableBlockingInPage since this method is also public.
| public async enable({ cacheSafe }: { cacheSafe: boolean }): Promise<void> { | |
| public async enable({ cacheSafe = false }: { cacheSafe: boolean } = {}): Promise<void> { |
| /** | ||
| * The `cacheSafe` can be set to `true` to enable the browser's resource cache. By default, caching is disabled, which is puppeteer's default behavior when request interception is enabled. Learn more here: https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#pagesetrequestinterceptionvalue-cachesafe | ||
| */ | ||
| public async enableBlockingInPage(page: puppeteer.Page, { cacheSafe = false }: { cacheSafe?: boolean } = {}): Promise<BlockingContext> { |
There was a problem hiding this comment.
Let's maybe pass whatever we got here to enable() and let this one handle the default value?
| public async enableBlockingInPage(page: puppeteer.Page, { cacheSafe = false }: { cacheSafe?: boolean } = {}): Promise<BlockingContext> { | |
| public async enableBlockingInPage(page: puppeteer.Page, opts: { cacheSafe?: boolean }): Promise<BlockingContext> { |
| let context: undefined | BlockingContext = this.contexts.get(page); | ||
| if (context !== undefined) { | ||
| return context; | ||
| } | ||
|
|
||
| context = new BlockingContext(page, this); | ||
| this.contexts.set(page, context); | ||
| await context.enable(); | ||
| await context.enable({ cacheSafe }); |
There was a problem hiding this comment.
| await context.enable({ cacheSafe }); | |
| await context.enable(opts); |
|
After merging this #1903 we now have a few conflicts here, sorry about that. Also a note about tests, we have started using |
|
I think this was made irrelevant by puppeteer/puppeteer#7217, which was released in v10.0.0. |
Even better! I will just release a new version of the adblocker with this new v10 tag in the list of Puppeteer versions then. Tank you. |
Closes #1809.
This works like puppeteer, in that you must opt in to using the cache when request interception is enabled. The default behavior of disabling the cache is preserved.