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

revert

Browse source
This commit is contained in:
Yury Semikhatsky 2024-11-05 16:38:58 -08:00
parent d2787c1ac6
commit 8d9b9078b5
3 changed files with 15 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ import type * as api from '../../types/types';
import { serializeError, isTargetClosedError, TargetClosedError } from './errors';
import { TimeoutSettings } from '../common/timeoutSettings';
import type * as channels from '@protocol/channels';
import { assert, headersObjectToArray, isObject, isRegExp, isString, LongStandingScope, urlMatches, urlMatchesEqual, mkdirIfNeeded, trimStringWithEllipsis, type URLMatch, zones } from '../utils';
import { assert, headersObjectToArray, isObject, isRegExp, isString, LongStandingScope, urlMatches, urlMatchesEqual, mkdirIfNeeded, trimStringWithEllipsis, type URLMatch } from '../utils';
import { Accessibility } from './accessibility';
import { Artifact } from './artifact';
import type { BrowserContext } from './browserContext';

34
packages/playwright-core/src/client/waiter.ts
View file

@ -17,7 +17,7 @@
import type { EventEmitter } from 'events';
import { rewriteErrorMessage } from '../utils/stackTrace';
import { TimeoutError } from './errors';
import { createGuid, ZoneReference, zones } from '../utils';
import { createGuid } from '../utils';
import type * as channels from '@protocol/channels';
import type { ChannelOwner } from './channelOwner';
@ -29,14 +29,10 @@ export class Waiter {
private _channelOwner: ChannelOwner<channels.EventTargetChannel>;
private _waitId: string;
private _error: string | undefined;
private _savedZone: ZoneReference;
constructor(channelOwner: ChannelOwner<channels.EventTargetChannel>, event: string) {
this._waitId = createGuid();
this._channelOwner = channelOwner;
// Save current chain before the wait for event API call (we don't nest API calls)
// and restore it later to find proper parent for the event listener.
this._savedZone = zones.currentZoneBefore('apiZone');
this._channelOwner._channel.waitForEventInfo({ info: { waitId: this._waitId, phase: 'before', event } }).catch(() => {});
this._dispose = [
() => this._channelOwner._wrapApiCall(async () => {
@ -45,17 +41,17 @@ export class Waiter {
];
}
static createForEvent(channelOwner: ChannelOwner<channels.EventTargetChannel>, event: string): Waiter {
static createForEvent(channelOwner: ChannelOwner<channels.EventTargetChannel>, event: string) {
return new Waiter(channelOwner, event);
}
async waitForEvent<T = void>(emitter: EventEmitter, event: string, predicate?: (arg: T) => boolean | Promise<boolean>): Promise<T> {
const { promise, dispose } = waitForEvent(emitter, event, this._savedZone, predicate);
const { promise, dispose } = waitForEvent(emitter, event, predicate);
return await this.waitForPromise(promise, dispose);
}
rejectOnEvent<T = void>(emitter: EventEmitter, event: string, error: Error | (() => Error), predicate?: (arg: T) => boolean | Promise<boolean>) {
const { promise, dispose } = waitForEvent(emitter, event, this._savedZone, predicate);
const { promise, dispose } = waitForEvent(emitter, event, predicate);
this._rejectOn(promise.then(() => { throw (typeof error === 'function' ? error() : error); }), dispose);
}
@ -107,21 +103,19 @@ export class Waiter {
}
}
function waitForEvent<T = void>(emitter: EventEmitter, event: string, savedZone: ZoneReference, predicate?: (arg: T) => boolean | Promise<boolean>): { promise: Promise<T>, dispose: () => void } {
function waitForEvent<T = void>(emitter: EventEmitter, event: string, predicate?: (arg: T) => boolean | Promise<boolean>): { promise: Promise<T>, dispose: () => void } {
let listener: (eventArg: any) => void;
const promise = new Promise<T>((resolve, reject) => {
listener = async (eventArg: any) => {
savedZone.runInZone(async () => {
try {
if (predicate && !(await predicate(eventArg)))
return;
emitter.removeListener(event, listener);
resolve(eventArg);
} catch (e) {
emitter.removeListener(event, listener);
reject(e);
}
});
try {
if (predicate && !(await predicate(eventArg)))
return;
emitter.removeListener(event, listener);
resolve(eventArg);
} catch (e) {
emitter.removeListener(event, listener);
reject(e);
}
};
emitter.addListener(event, listener);
});

25
packages/playwright-core/src/utils/zones.ts
View file

@ -39,17 +39,6 @@ class ZoneManager {
return this._asyncLocalStorage.run(undefined, func);
}
currentZoneBefore(type: ZoneType): ZoneReference {
let zone = this._asyncLocalStorage.getStore();
while (zone && zone.type === type)
zone = zone.previous;
return new ZoneReference(zone, this._asyncLocalStorage);
}
currentZone(): ZoneReference {
return new ZoneReference(this._asyncLocalStorage.getStore(), this._asyncLocalStorage);
}
printZones() {
const zones = [];
for (let zone = this._asyncLocalStorage.getStore(); zone; zone = zone.previous) {
@ -64,20 +53,6 @@ class ZoneManager {
}
}
export class ZoneReference {
private _zone: Zone<unknown> | undefined;
private _asyncLocalStorage: AsyncLocalStorage<Zone<unknown>|undefined>;
constructor(zone: Zone<unknown> | undefined, asyncLocalStorage: AsyncLocalStorage<Zone<unknown>|undefined>) {
this._zone = zone;
this._asyncLocalStorage = asyncLocalStorage;
}
runInZone<R>(func: () => R): R {
return this._asyncLocalStorage.run(this._zone, func);
}
}
class Zone<T> {
readonly type: ZoneType;
readonly data: T;