Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/BrowserManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,13 @@ export class BrowserManager {
userDataDir,
blockedUrlPattern: blocklist,
allowedUrlPattern: allowlist,
categoryExtensions: enableExtensions,
} = this.#serverArgs;
// Important: only pass channel, if autoConnect is true.
const channel = isAutoConnect ? this.#serverArgs.channel : undefined;

const connectOptions: Parameters<typeof puppeteer.connect>[0] = {
targetFilter: BrowserManager.makeTargetFilter(),
targetFilter: BrowserManager.makeTargetFilter(enableExtensions),
defaultViewport: null,
handleDevToolsAsPage: true,
blocklist,
Expand Down
22 changes: 22 additions & 0 deletions tests/browser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,28 @@ describe('browser', () => {
sinon.assert.notCalled(pptrBrowser.close);
});

for (const categoryExtensions of [false, true]) {
it(`${categoryExtensions ? 'keeps' : 'drops'} extension targets when connecting with categoryExtensions=${categoryExtensions}`, async () => {
const connectStub = sinon
.stub(puppeteer, 'connect')
.resolves(createMockPuppeteerBrowser());

const args = createMockParsedArguments({
browserUrl: 'http://127.0.0.1:9222',
categoryExtensions,
});
await new BrowserManager(args).ensureBrowser();

const {targetFilter} = connectStub.firstCall.args[0]!;
assert.ok(targetFilter);
const target = {url: () => 'chrome-extension://abcdefgh/popup.html'};
assert.strictEqual(
targetFilter(target as Parameters<typeof targetFilter>[0]),
categoryExtensions,
);
});
}

it('deduplicates concurrent ensureBrowser() calls while launch is in-flight', async () => {
const pptrBrowser = createMockPuppeteerBrowser();
const {promise, resolve} = Promise.withResolvers<Browser>();
Expand Down
Loading