Skip to content

Commit 45387e5

Browse files
authored
chore: remove chromium._connectToWorker (#44097)
1 parent 3a52f0e commit 45387e5

15 files changed

Lines changed: 7 additions & 201 deletions

File tree

‎packages/isomorphic/protocolMetainfo.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ export const methodMetainfo = new Map<string, MethodMetainfo>([
118118
['BrowserType.launch', { title: 'Launch browser', }],
119119
['BrowserType.launchPersistentContext', { title: 'Launch persistent context', }],
120120
['BrowserType.connectOverCDP', { title: 'Connect over CDP', }],
121-
['BrowserType.connectToWorker', { title: 'Connect to worker', }],
122121
['Disposable.dispose', { internal: true, }],
123122
['Electron.launch', { title: 'Launch electron', }],
124123
['ElectronApplication.browserWindow', { internal: true, }],
@@ -348,7 +347,6 @@ export const methodMetainfo = new Map<string, MethodMetainfo>([
348347
['Tracing.tracingStop', { title: 'Stop tracing', group: 'configuration', }],
349348
['Tracing.harStart', { internal: true, }],
350349
['Tracing.harExport', { internal: true, }],
351-
['Worker.disconnect', { title: 'Disconnect from worker', }],
352350
['Worker.evaluateExpression', { title: 'Evaluate', }],
353351
['Worker.evaluateExpressionHandle', { title: 'Evaluate', }],
354352
['Worker.updateSubscription', { internal: true, }]

‎packages/playwright-core/src/client/browserType.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import { ChannelOwner, apiCall } from './channelOwner';
2424
import { envObjectToArray } from './clientHelper';
2525
import { connectToBrowser } from './connect';
2626
import { TimeoutSettings } from './timeoutSettings';
27-
import { Worker } from './worker';
2827

2928
import type { Playwright } from './playwright';
3029
import type { ConnectOptions, LaunchOptions, LaunchPersistentContextOptions, LaunchServerOptions } from './types';
@@ -177,15 +176,6 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
177176
await this._instrumentation.runAfterCreateBrowserContext(BrowserContext.from(result.defaultContext));
178177
return browser;
179178
}
180-
181-
async _connectToWorker(endpoint: string, options: { timeout?: number } = {}): Promise<Worker> {
182-
if (this.name() !== 'chromium')
183-
throw new Error('Connecting to workers is only supported in Chromium.');
184-
const result = await this._channel.connectToWorker({
185-
endpoint,
186-
}, new TimeoutSettings().timeout(options));
187-
return Worker.from(result.worker);
188-
}
189179
}
190180

191181
function isConnectionTransport(value: any): value is api.ConnectOverCDPTransport {

‎packages/playwright-core/src/client/channels.d.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,7 +1814,6 @@ export interface BrowserTypeChannel extends BrowserTypeEventTarget, Channel {
18141814
launch(params: BrowserTypeLaunchParams, options: TimeoutOptions): Promise<BrowserTypeLaunchResult>;
18151815
launchPersistentContext(params: BrowserTypeLaunchPersistentContextParams, options: TimeoutOptions): Promise<BrowserTypeLaunchPersistentContextResult>;
18161816
connectOverCDP(params: BrowserTypeConnectOverCDPParams, options: TimeoutOptions): Promise<BrowserTypeConnectOverCDPResult>;
1817-
connectToWorker(params: BrowserTypeConnectToWorkerParams, options: TimeoutOptions): Promise<BrowserTypeConnectToWorkerResult>;
18181817
}
18191818
export type BrowserTypeLaunchParams = {
18201819
channel?: string,
@@ -2076,15 +2075,6 @@ export type BrowserTypeConnectOverCDPResult = {
20762075
browser: BrowserChannel,
20772076
defaultContext?: BrowserContextChannel,
20782077
};
2079-
export type BrowserTypeConnectToWorkerParams = {
2080-
endpoint: string,
2081-
};
2082-
export type BrowserTypeConnectToWorkerOptions = {
2083-
2084-
};
2085-
export type BrowserTypeConnectToWorkerResult = {
2086-
worker: WorkerChannel,
2087-
};
20882078

20892079
export interface BrowserTypeEvents {
20902080
}
@@ -5320,7 +5310,6 @@ export interface WorkerEventTarget {
53205310
}
53215311
export interface WorkerChannel extends WorkerEventTarget, Channel {
53225312
_type_Worker: boolean;
5323-
disconnect(params: WorkerDisconnectParams, options: TimeoutOptions): Promise<WorkerDisconnectResult>;
53245313
evaluateExpression(params: WorkerEvaluateExpressionParams, options: TimeoutOptions): Promise<WorkerEvaluateExpressionResult>;
53255314
evaluateExpressionHandle(params: WorkerEvaluateExpressionHandleParams, options: TimeoutOptions): Promise<WorkerEvaluateExpressionHandleResult>;
53265315
updateSubscription(params: WorkerUpdateSubscriptionParams, options: TimeoutOptions): Promise<WorkerUpdateSubscriptionResult>;
@@ -5337,13 +5326,6 @@ export type WorkerConsoleEvent = {
53375326
timestamp: number,
53385327
};
53395328
export type WorkerCloseEvent = {};
5340-
export type WorkerDisconnectParams = {
5341-
reason?: string,
5342-
};
5343-
export type WorkerDisconnectOptions = {
5344-
reason?: string,
5345-
};
5346-
export type WorkerDisconnectResult = void;
53475329
export type WorkerEvaluateExpressionParams = {
53485330
expression: string,
53495331
isFunction?: boolean,

‎packages/playwright-core/src/client/worker.ts‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import { LongStandingScope } from '@isomorphic/manualPromise';
1818
import { ChannelOwner, apiCall } from './channelOwner';
1919
import { ConsoleMessage } from './consoleMessage';
20-
import { isTargetClosedError, TargetClosedError } from './errors';
20+
import { TargetClosedError } from './errors';
2121
import { Events } from './events';
2222
import { JSHandle, assertMaxArguments, parseResult, serializeArgument } from './jsHandle';
2323
import { TimeoutSettings, kNoTimeout } from './timeoutSettings';
@@ -51,7 +51,6 @@ export class Worker extends ChannelOwner<channels.WorkerChannel> implements api.
5151
[Events.Worker.Console, 'console'],
5252
]));
5353
this._channel.on('console', event => {
54-
// Note: we only receive console events here for workers from "chromium._connectToWorker".
5554
this.emit(Events.Worker.Console, new ConsoleMessage(event, null, this));
5655
});
5756
this._channel.on('close', () => {
@@ -99,15 +98,4 @@ export class Worker extends ChannelOwner<channels.WorkerChannel> implements api.
9998
waiter.dispose();
10099
return result;
101100
}
102-
103-
async _disconnect(options: { reason?: string } = {}): Promise<void> {
104-
this._closeReason = options.reason;
105-
try {
106-
await this._channel.disconnect(options, kNoTimeout);
107-
} catch (e) {
108-
if (isTargetClosedError(e))
109-
return;
110-
throw e;
111-
}
112-
}
113101
}

‎packages/playwright-core/src/server/browserType.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import { WebSocketTransport } from './transport';
3636

3737
import type { Browser, BrowserOptions, BrowserProcess } from './browser';
3838
import type { BrowserContext } from './browserContext';
39-
import type { Worker } from './page';
4039
import type { Progress } from './progress';
4140
import type { BrowserName } from './registry';
4241
import type { ConnectionTransport } from './transport';
@@ -288,10 +287,6 @@ export abstract class BrowserType extends SdkObject {
288287
throw new Error('CDP connections are only supported by Chromium');
289288
}
290289

291-
async connectToWorker(progress: Progress, endpoint: string): Promise<Worker> {
292-
throw new Error('CDP connections are only supported by Chromium');
293-
}
294-
295290
async launchWithSeleniumHub(progress: Progress, hubUrl: string, options: types.LaunchOptions): Promise<Browser> {
296291
throw new Error('Connecting to SELENIUM_REMOTE_URL is only supported by Chromium');
297292
}

‎packages/playwright-core/src/server/channels.d.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,7 +1815,6 @@ export interface BrowserTypeChannel extends BrowserTypeEventTarget, Channel {
18151815
launch(params: BrowserTypeLaunchParams, progress: Progress): Promise<BrowserTypeLaunchResult>;
18161816
launchPersistentContext(params: BrowserTypeLaunchPersistentContextParams, progress: Progress): Promise<BrowserTypeLaunchPersistentContextResult>;
18171817
connectOverCDP(params: BrowserTypeConnectOverCDPParams, progress: Progress): Promise<BrowserTypeConnectOverCDPResult>;
1818-
connectToWorker(params: BrowserTypeConnectToWorkerParams, progress: Progress): Promise<BrowserTypeConnectToWorkerResult>;
18191818
}
18201819
export type BrowserTypeLaunchParams = {
18211820
channel?: string,
@@ -2077,15 +2076,6 @@ export type BrowserTypeConnectOverCDPResult = {
20772076
browser: BrowserChannel,
20782077
defaultContext?: BrowserContextChannel,
20792078
};
2080-
export type BrowserTypeConnectToWorkerParams = {
2081-
endpoint: string,
2082-
};
2083-
export type BrowserTypeConnectToWorkerOptions = {
2084-
2085-
};
2086-
export type BrowserTypeConnectToWorkerResult = {
2087-
worker: WorkerChannel,
2088-
};
20892079

20902080
export interface BrowserTypeEvents {
20912081
}
@@ -5321,7 +5311,6 @@ export interface WorkerEventTarget {
53215311
}
53225312
export interface WorkerChannel extends WorkerEventTarget, Channel {
53235313
_type_Worker: boolean;
5324-
disconnect(params: WorkerDisconnectParams, progress: Progress): Promise<WorkerDisconnectResult>;
53255314
evaluateExpression(params: WorkerEvaluateExpressionParams, progress: Progress): Promise<WorkerEvaluateExpressionResult>;
53265315
evaluateExpressionHandle(params: WorkerEvaluateExpressionHandleParams, progress: Progress): Promise<WorkerEvaluateExpressionHandleResult>;
53275316
updateSubscription(params: WorkerUpdateSubscriptionParams, progress: Progress): Promise<WorkerUpdateSubscriptionResult>;
@@ -5338,13 +5327,6 @@ export type WorkerConsoleEvent = {
53385327
timestamp: number,
53395328
};
53405329
export type WorkerCloseEvent = {};
5341-
export type WorkerDisconnectParams = {
5342-
reason?: string,
5343-
};
5344-
export type WorkerDisconnectOptions = {
5345-
reason?: string,
5346-
};
5347-
export type WorkerDisconnectResult = void;
53485330
export type WorkerEvaluateExpressionParams = {
53495331
expression: string,
53505332
isFunction?: boolean,

‎packages/playwright-core/src/server/chromium/chromium.ts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,14 @@ import { fetchData } from '../utils';
3131
import { getUserAgent } from '../userAgent';
3232
import { chromiumSwitches } from './chromiumSwitches';
3333
import { shouldProxyLoopback, CRBrowser } from './crBrowser';
34-
import { ConnectionEvents, CRConnection, kBrowserCloseMessageId } from './crConnection';
34+
import { kBrowserCloseMessageId } from './crConnection';
3535
import { validateBrowserContextOptions } from '../browserContext';
3636
import { BrowserType, kNoXServerRunningError } from '../browserType';
3737
import { helper } from '../helper';
3838
import { registry } from '../registry';
3939
import { WebSocketTransport } from '../transport';
4040
import { CRDevTools } from './crDevTools';
4141
import { Browser } from '../browser';
42-
import { Worker } from '../page';
43-
import { CRExecutionContext, createHandle } from './crExecutionContext';
44-
import { ConsoleMessage } from '../console';
45-
import { stackTraceToLocation } from './crProtocolHelper';
4642

4743
import type { HTTPRequestParams } from '@utils/network';
4844
import type { BrowserOptions, BrowserProcess } from '../browser';
@@ -169,40 +165,6 @@ export class Chromium extends BrowserType {
169165
}
170166
}
171167

172-
override async connectToWorker(progress: Progress, endpoint: string) {
173-
const wsEndpoint = await urlToWSEndpoint(progress, endpoint, {});
174-
const transport = await WebSocketTransport.connect(progress, wsEndpoint);
175-
try {
176-
const connection = new CRConnection(this, transport, helper.debugProtocolLogger(), new RecentLogsCollector());
177-
const session = connection.rootSession;
178-
const worker = new Worker(this, '', () => transport.closeAndWait());
179-
session.on('Runtime.executionContextCreated', event => {
180-
const isDefault = event.context.auxData?.isDefault as boolean | undefined;
181-
if (isDefault === false) {
182-
// Node.js sometimes creates internal contexts we are not interested in.
183-
return;
184-
}
185-
worker.workerScriptLoaded();
186-
worker.createExecutionContext(new CRExecutionContext(session, event.context));
187-
});
188-
session.on('Runtime.executionContextDestroyed', () => worker.destroyExecutionContext('Execution context was destroyed'));
189-
session.on('Runtime.consoleAPICalled', event => {
190-
if (!worker.existingExecutionContext)
191-
return;
192-
const args = event.args.map(o => createHandle(worker.existingExecutionContext!, o));
193-
const message = new ConsoleMessage(null, worker, event.type, undefined, args, stackTraceToLocation(event.stackTrace), event.timestamp);
194-
worker.emit(Worker.Events.Console, message);
195-
});
196-
connection.on(ConnectionEvents.Disconnected, () => worker.didClose());
197-
session._sendMayFail('Runtime.enable');
198-
session._sendMayFail('Runtime.runIfWaitingForDebugger');
199-
return worker;
200-
} catch (error) {
201-
await progress.race(transport.closeAndWait().catch(() => {}));
202-
throw error;
203-
}
204-
}
205-
206168
private _createDevTools() {
207169
// TODO: this is totally wrong when using channels.
208170
const directory = registry.findExecutable('chromium').directory;

‎packages/playwright-core/src/server/dispatchers/browserTypeDispatcher.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import { BrowserContextDispatcher } from './browserContextDispatcher';
1818
import { BrowserDispatcher } from './browserDispatcher';
19-
import { WorkerDispatcher } from './pageDispatcher';
2019
import { Dispatcher } from './dispatcher';
2120

2221
import type { BrowserType } from '../browserType';
@@ -64,11 +63,4 @@ export class BrowserTypeDispatcher extends Dispatcher<BrowserType, channels.Brow
6463
defaultContext: browser._defaultContext ? BrowserContextDispatcher.from(browserDispatcher, browser._defaultContext) : undefined,
6564
};
6665
}
67-
68-
async connectToWorker(params: channels.BrowserTypeConnectToWorkerParams, progress: Progress): Promise<channels.BrowserTypeConnectToWorkerResult> {
69-
if (this._denyLaunch)
70-
throw new Error(`Launching more browsers is not allowed.`);
71-
const worker = await this._object.connectToWorker(progress, params.endpoint);
72-
return { worker: new WorkerDispatcher(this, worker) };
73-
}
7466
}

‎packages/playwright-core/src/server/dispatchers/pageDispatcher.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import type { Frame } from '../frames';
4545
import type { RouteHandler } from '../network';
4646
import type { InitScript } from '../page';
4747
import type { Disposable } from '../disposable';
48-
import type { BrowserTypeDispatcher } from './browserTypeDispatcher';
4948
import type { ConsoleMessage } from '../console';
5049
import type * as channels from '../channels';
5150
import type { Progress } from '../progress';
@@ -536,19 +535,19 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
536535
}
537536

538537

539-
export class WorkerDispatcher extends Dispatcher<Worker, channels.WorkerChannel, PageDispatcher | BrowserContextDispatcher | BrowserTypeDispatcher> implements channels.WorkerChannel {
538+
export class WorkerDispatcher extends Dispatcher<Worker, channels.WorkerChannel, PageDispatcher | BrowserContextDispatcher> implements channels.WorkerChannel {
540539
_type_Worker = true;
541540

542541
readonly _subscriptions = new Set<channels.WorkerUpdateSubscriptionParams['event']>();
543542

544-
static fromNullable(scope: PageDispatcher | BrowserContextDispatcher | BrowserTypeDispatcher, worker: Worker | null): WorkerDispatcher | undefined {
543+
static fromNullable(scope: PageDispatcher | BrowserContextDispatcher, worker: Worker | null): WorkerDispatcher | undefined {
545544
if (!worker)
546545
return undefined;
547546
const result = scope.connection.existingDispatcher<WorkerDispatcher>(worker);
548547
return result || new WorkerDispatcher(scope, worker);
549548
}
550549

551-
constructor(scope: PageDispatcher | BrowserContextDispatcher | BrowserTypeDispatcher, worker: Worker) {
550+
constructor(scope: PageDispatcher | BrowserContextDispatcher, worker: Worker) {
552551
super(scope, worker, 'Worker', {
553552
url: worker.url
554553
});
@@ -569,10 +568,6 @@ export class WorkerDispatcher extends Dispatcher<Worker, channels.WorkerChannel,
569568
});
570569
}
571570

572-
async disconnect(params: channels.WorkerDisconnectParams, progress: Progress): Promise<void> {
573-
await this._object.disconnect(progress, params);
574-
}
575-
576571
async evaluateExpression(params: channels.WorkerEvaluateExpressionParams, progress: Progress): Promise<channels.WorkerEvaluateExpressionResult> {
577572
return { value: serializeResult(await this._object.evaluateExpression(progress, params.expression, params.isFunction, parseArgument(params.arg))) };
578573
}

‎packages/playwright-core/src/server/page.ts‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -991,18 +991,16 @@ export class Worker extends SdkObject<WorkerEventMap> {
991991
static Events = WorkerEvent;
992992

993993
readonly url: string;
994-
private _onDisconnect?: () => Promise<void>;
995994
private _executionContextPromise = new ManualPromise<js.ExecutionContext>();
996995
private _workerScriptLoaded = false;
997996
existingExecutionContext: js.ExecutionContext | null = null;
998997
readonly openScope = new LongStandingScope();
999998
_closeReason: string | undefined;
1000999

1001-
constructor(parent: SdkObject, url: string, onDisconnect?: () => Promise<void>) {
1000+
constructor(parent: SdkObject, url: string) {
10021001
super(parent, 'worker');
10031002
this.attribution.worker = this;
10041003
this.url = url;
1005-
this._onDisconnect = onDisconnect;
10061004
}
10071005

10081006
createExecutionContext(delegate: js.ExecutionContextDelegate) {
@@ -1045,13 +1043,6 @@ export class Worker extends SdkObject<WorkerEventMap> {
10451043
// The worker may close before its execution context is ready.
10461044
return await progress.race(this.openScope.race(this._executionContextPromise));
10471045
}
1048-
1049-
async disconnect(progress: Progress, options: { reason?: string } = {}) {
1050-
if (!this._onDisconnect)
1051-
throw new Error('Cannot disconnect from this worker');
1052-
this._closeReason = options.reason;
1053-
await progress.race(this._onDisconnect());
1054-
}
10551046
}
10561047

10571048
export class PageBinding extends DisposableObject {

0 commit comments

Comments
 (0)