Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: separate Selectors instance per Playwright object (#9529)

Browse source 
We used to share selectors for inprocess, remote and any internal playwright objects.
This commit is contained in:
Dmitry Gozman 2021-10-15 09:21:56 -07:00 committed by GitHub
parent b391d525a9
commit b383c6bf3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/playwright-core/src/client/browserType.ts
View file

@ -27,6 +27,7 @@ import { assert, headersObjectToArray, getUserAgent, monotonicTime } from '../ut
import * as api from '../../types/types'; import * as api from '../../types/types';
import { kBrowserClosedError } from '../utils/errors'; import { kBrowserClosedError } from '../utils/errors';
import { raceAgainstDeadline } from '../utils/async'; import { raceAgainstDeadline } from '../utils/async';
import type { Playwright } from './playwright';
export interface BrowserServerLauncher { export interface BrowserServerLauncher {
launchServer(options?: LaunchServerOptions): Promise<api.BrowserServer>; launchServer(options?: LaunchServerOptions): Promise<api.BrowserServer>;
@ -43,6 +44,7 @@ export interface BrowserServer extends api.BrowserServer {
export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel, channels.BrowserTypeInitializer> implements api.BrowserType { export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel, channels.BrowserTypeInitializer> implements api.BrowserType {
_serverLauncher?: BrowserServerLauncher; _serverLauncher?: BrowserServerLauncher;
_contexts = new Set<BrowserContext>(); _contexts = new Set<BrowserContext>();
_playwright!: Playwright;
// Instrumentation. // Instrumentation.
_defaultContextOptions: BrowserContextOptions = {}; _defaultContextOptions: BrowserContextOptions = {};
@ -54,10 +56,6 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel, chann
return (browserType as any)._object; return (browserType as any)._object;
} }
constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.BrowserTypeInitializer) {
super(parent, type, guid, initializer);
}
executablePath(): string { executablePath(): string {
if (!this._initializer.executablePath) if (!this._initializer.executablePath)
throw new Error('Browser is not supported on current platform'); throw new Error('Browser is not supported on current platform');
@ -172,6 +170,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel, chann
closePipe(); closePipe();
return; return;
} }
playwright._setSelectors(this._playwright.selectors);
browser = Browser.from(playwright._initializer.preLaunchedBrowser!); browser = Browser.from(playwright._initializer.preLaunchedBrowser!);
browser._logger = logger; browser._logger = logger;
browser._shouldCloseConnectionOnClose = true; browser._shouldCloseConnectionOnClose = true;

16
packages/playwright-core/src/client/playwright.ts
View file

@ -25,7 +25,7 @@ import { BrowserType } from './browserType';
import { ChannelOwner } from './channelOwner'; import { ChannelOwner } from './channelOwner';
import { Electron } from './electron'; import { Electron } from './electron';
import { Fetch } from './fetch'; import { Fetch } from './fetch';
import { Selectors, SelectorsOwner, sharedSelectors } from './selectors'; import { Selectors, SelectorsOwner } from './selectors';
import { Size } from './types'; import { Size } from './types';
const dnsLookupAsync = util.promisify(dns.lookup); const dnsLookupAsync = util.promisify(dns.lookup);
@ -46,7 +46,7 @@ export class Playwright extends ChannelOwner<channels.PlaywrightChannel, channel
readonly firefox: BrowserType; readonly firefox: BrowserType;
readonly webkit: BrowserType; readonly webkit: BrowserType;
readonly devices: Devices; readonly devices: Devices;
readonly selectors: Selectors; selectors: Selectors;
readonly request: Fetch; readonly request: Fetch;
readonly errors: { TimeoutError: typeof TimeoutError }; readonly errors: { TimeoutError: typeof TimeoutError };
private _sockets = new Map<string, net.Socket>(); private _sockets = new Map<string, net.Socket>();
@ -56,14 +56,17 @@ export class Playwright extends ChannelOwner<channels.PlaywrightChannel, channel
super(parent, type, guid, initializer); super(parent, type, guid, initializer);
this.request = new Fetch(this); this.request = new Fetch(this);
this.chromium = BrowserType.from(initializer.chromium); this.chromium = BrowserType.from(initializer.chromium);
this.chromium._playwright = this;
this.firefox = BrowserType.from(initializer.firefox); this.firefox = BrowserType.from(initializer.firefox);
this.firefox._playwright = this;
this.webkit = BrowserType.from(initializer.webkit); this.webkit = BrowserType.from(initializer.webkit);
this.webkit._playwright = this;
this._android = Android.from(initializer.android); this._android = Android.from(initializer.android);
this._electron = Electron.from(initializer.electron); this._electron = Electron.from(initializer.electron);
this.devices = {}; this.devices = {};
for (const { name, descriptor } of initializer.deviceDescriptors) for (const { name, descriptor } of initializer.deviceDescriptors)
this.devices[name] = descriptor; this.devices[name] = descriptor;
this.selectors = sharedSelectors; this.selectors = new Selectors();
this.errors = { TimeoutError }; this.errors = { TimeoutError };
const selectorsOwner = SelectorsOwner.from(initializer.selectors); const selectorsOwner = SelectorsOwner.from(initializer.selectors);
@ -75,6 +78,13 @@ export class Playwright extends ChannelOwner<channels.PlaywrightChannel, channel
}); });
} }
_setSelectors(selectors: Selectors) {
const selectorsOwner = SelectorsOwner.from(this._initializer.selectors);
this.selectors._removeChannel(selectorsOwner);
this.selectors = selectors;
this.selectors._addChannel(selectorsOwner);
}
_enablePortForwarding(redirectPortForTest?: number) { _enablePortForwarding(redirectPortForTest?: number) {
this._redirectPortForTest = redirectPortForTest; this._redirectPortForTest = redirectPortForTest;
this._channel.on('socksRequested', ({ uid, host, port }) => this._onSocksRequested(uid, host, port)); this._channel.on('socksRequested', ({ uid, host, port }) => this._onSocksRequested(uid, host, port));

2
packages/playwright-core/src/client/selectors.ts
View file

@ -50,5 +50,3 @@ export class SelectorsOwner extends ChannelOwner<channels.SelectorsChannel, chan
return (browser as any)._object; return (browser as any)._object;
} }
} }
export const sharedSelectors = new Selectors();