Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/playwright-core/src/server/bidi/bidiPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export class BidiPage implements PageDelegate {
const delegate = new BidiExecutionContext(this._session, realmInfo);
const worker = new Worker(this._page, realmInfo.origin);
this._realmToWorkerContext.set(realmInfo.realm, worker.createExecutionContext(delegate));
worker.workerScriptLoaded();
this._page.addWorker(realmInfo.realm, worker);
return;
}
Expand Down
9 changes: 9 additions & 0 deletions packages/playwright-core/src/server/chromium/crBrowser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export class CRBrowser extends Browser {
_serviceWorkers = new Map<string, CRServiceWorker>();
_devtools?: CRDevTools;
private _version = '';
private _majorVersion = 0;

private _tracingRecording = false;
private _tracingClient: CRSession | undefined;
Expand All @@ -68,6 +69,10 @@ export class CRBrowser extends Browser {

const version = await session.send('Browser.getVersion');
browser._version = version.product.substring(version.product.indexOf('/') + 1);
try {
browser._majorVersion = +browser._version.split('.')[0];
} catch {
}
browser._userAgent = version.userAgent;
// We don't trust the option as it may lie in case of connectOverCDP where remote browser
// may have been launched with different options.
Expand Down Expand Up @@ -130,6 +135,10 @@ export class CRBrowser extends Browser {
return this._version;
}

majorVersion() {
return this._majorVersion;
}

userAgent(): string {
return this._userAgent;
}
Expand Down
4 changes: 4 additions & 0 deletions packages/playwright-core/src/server/chromium/crPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,10 @@ class FrameSession {
session.once('Runtime.executionContextCreated', async event => {
worker.createExecutionContext(new CRExecutionContext(session, event.context));
});
if (this._crPage._browserContext._browser.majorVersion() >= 143)
session.on('Inspector.workerScriptLoaded', () => worker.workerScriptLoaded());
else
worker.workerScriptLoaded();
// This might fail if the target is closed before we initialize.
session._sendMayFail('Runtime.enable');
// TODO: attribute workers to the right frame.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ export class CRServiceWorker extends Worker {
session.once('Runtime.executionContextCreated', event => {
this.createExecutionContext(new CRExecutionContext(session, event.context));
});
if (this.browserContext._browser.majorVersion() >= 143)
session.on('Inspector.workerScriptLoaded', () => this.workerScriptLoaded());
else
this.workerScriptLoaded();

if (this._networkManager && this._isNetworkInspectionEnabled()) {
this.updateRequestInterception();
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/server/firefox/ffPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ export class FFPage implements PageDelegate {
this._page.addWorker(workerId, worker);
workerSession.once('Runtime.executionContextCreated', event => {
worker.createExecutionContext(new FFExecutionContext(workerSession, event.executionContextId));
worker.workerScriptLoaded();
});
workerSession.on('Runtime.console', event => {
const { type, args, location } = event;
Expand Down
15 changes: 10 additions & 5 deletions packages/playwright-core/src/server/page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -870,24 +870,29 @@ export class Worker extends SdkObject {
};

readonly url: string;
private _executionContextPromise: Promise<js.ExecutionContext>;
private _executionContextCallback: (value: js.ExecutionContext) => void;
private _executionContextPromise = new ManualPromise<js.ExecutionContext>();
private _workerScriptLoaded = false;
existingExecutionContext: js.ExecutionContext | null = null;
readonly openScope = new LongStandingScope();

constructor(parent: SdkObject, url: string) {
super(parent, 'worker');
this.url = url;
this._executionContextCallback = () => {};
this._executionContextPromise = new Promise(x => this._executionContextCallback = x);
}

createExecutionContext(delegate: js.ExecutionContextDelegate) {
this.existingExecutionContext = new js.ExecutionContext(this, delegate, 'worker');
this._executionContextCallback(this.existingExecutionContext);
if (this._workerScriptLoaded)
this._executionContextPromise.resolve(this.existingExecutionContext);
return this.existingExecutionContext;
}

workerScriptLoaded() {
this._workerScriptLoaded = true;
if (this.existingExecutionContext)
this._executionContextPromise.resolve(this.existingExecutionContext);
}

didClose() {
if (this.existingExecutionContext)
this.existingExecutionContext.contextDestroyed('Worker was closed');
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/server/webkit/wkWorkers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export class WKWorkers {
});
this._workerSessions.set(event.workerId, workerSession);
worker.createExecutionContext(new WKExecutionContext(workerSession, undefined));
worker.workerScriptLoaded();
this._page.addWorker(event.workerId, worker);
workerSession.on('Console.messageAdded', event => this._onConsoleMessage(worker, event));
Promise.all([
Expand Down
Loading