Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: resolve target manager init if no existing targets detected #8748

Merged
merged 1 commit into from Aug 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 18 additions & 13 deletions src/common/ChromeTargetManager.ts
Expand Up @@ -103,30 +103,37 @@ export class ChromeTargetManager extends EventEmitter implements TargetManager {

// TODO: remove `as any` once the protocol definitions are updated with the
// next Chromium roll.
this.#connection.send('Target.setDiscoverTargets', {
discover: true,
filter: [{type: 'tab', exclude: true}, {}],
} as any);
this.#connection
.send('Target.setDiscoverTargets', {
discover: true,
filter: [{type: 'tab', exclude: true}, {}],
} as any)
.then(this.#storeExistingTargetsForInit)
.catch(debugError);
}

async initialize(): Promise<void> {
this.#targetsIdsForInit = new Set();
#storeExistingTargetsForInit = () => {
for (const [
targetId,
targetInfo,
] of this.#discoveredTargetsByTargetId.entries()) {
if (
!this.#targetFilterCallback ||
this.#targetFilterCallback(targetInfo)
(!this.#targetFilterCallback ||
this.#targetFilterCallback(targetInfo)) &&
targetInfo.type !== 'browser'
) {
this.#targetsIdsForInit.add(targetId);
}
}
};

async initialize(): Promise<void> {
await this.#connection.send('Target.setAutoAttach', {
waitForDebuggerOnStart: true,
flatten: true,
autoAttach: true,
});
this.#finishInitializationIfReady();
await this.#initializePromise;
}

Expand Down Expand Up @@ -358,9 +365,7 @@ export class ChromeTargetManager extends EventEmitter implements TargetManager {

this.#targetsIdsForInit.delete(target._targetId);
this.emit(TargetManagerEmittedEvents.TargetAvailable, target);
if (this.#targetsIdsForInit.size === 0) {
this.#initializeCallback();
}
this.#finishInitializationIfReady();

// TODO: the browser might be shutting down here. What do we do with the
// error?
Expand All @@ -374,8 +379,8 @@ export class ChromeTargetManager extends EventEmitter implements TargetManager {
]).catch(debugError);
};

#finishInitializationIfReady(targetId: string): void {
this.#targetsIdsForInit.delete(targetId);
#finishInitializationIfReady(targetId?: string): void {
targetId !== undefined && this.#targetsIdsForInit.delete(targetId);
if (this.#targetsIdsForInit.size === 0) {
this.#initializeCallback();
}
Expand Down
18 changes: 18 additions & 0 deletions test/src/launcher.spec.ts
Expand Up @@ -699,6 +699,24 @@ describe('Launcher specs', function () {
remoteBrowser.close(),
]);
});
it('should be able to connect to a browser with no page targets', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState();

const originalBrowser = await puppeteer.launch(defaultBrowserOptions);
const pages = await originalBrowser.pages();
await Promise.all(
pages.map(page => {
return page.close();
})
);
const remoteBrowser = await puppeteer.connect({
browserWSEndpoint: originalBrowser.wsEndpoint(),
});
await Promise.all([
utils.waitEvent(originalBrowser, 'disconnected'),
remoteBrowser.close(),
]);
});
it('should support ignoreHTTPSErrors option', async () => {
const {httpsServer, puppeteer, defaultBrowserOptions} = getTestState();

Expand Down