thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(revert): use LazyArg for puppeteer utilities (#9590)

Browse Source 
Reverts puppeteer/puppeteer#9575
This commit is contained in:
Alex Rudenko 2023-01-26 09:50:06 +01:00 committed by GitHub
parent 496658f029
commit 6edd996768
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/puppeteer-core/src/common/Frame.ts
View File

@ -34,7 +34,6 @@ import {Page} from '../api/Page.js';
import {getQueryHandlerAndSelector} from './QueryHandler.js';
import {EvaluateFunc, HandleFor, NodeFor} from './types.js';
import {importFS} from './util.js';
import {LazyArg} from './LazyArg.js';
/**
* @public
@ -805,9 +804,8 @@ export class Frame {
type = type ?? 'text/javascript';
const puppeteerWorld = this.worlds[PUPPETEER_WORLD];
return this.worlds[MAIN_WORLD].transferHandle(
await puppeteerWorld.evaluateHandle(
await this.worlds[PUPPETEER_WORLD].evaluateHandle(
async ({createDeferredPromise}, {url, id, type, content}) => {
const promise = createDeferredPromise<void>();
const script = document.createElement('script');
@ -841,9 +839,7 @@ export class Frame {
await promise;
return script;
},
LazyArg.create(() => {
return puppeteerWorld.puppeteerUtil;
}),
await this.worlds[PUPPETEER_WORLD].puppeteerUtil,
{...options, type, content}
)
);
@ -891,9 +887,8 @@ export class Frame {
options.content = content;
}
const puppeteerWorld = this.worlds[PUPPETEER_WORLD];
return this.worlds[MAIN_WORLD].transferHandle(
await puppeteerWorld.evaluateHandle(
await this.worlds[PUPPETEER_WORLD].evaluateHandle(
async ({createDeferredPromise}, {url, content}) => {
const promise = createDeferredPromise<void>();
let element: HTMLStyleElement | HTMLLinkElement;
@ -928,9 +923,7 @@ export class Frame {
await promise;
return element;
},
LazyArg.create(() => {
return puppeteerWorld.puppeteerUtil;
}),
await this.worlds[PUPPETEER_WORLD].puppeteerUtil,
options
)
);

20
packages/puppeteer-core/src/common/IsolatedWorld.ts
View File

@ -28,7 +28,7 @@ import {JSHandle} from './JSHandle.js';
import {LazyArg} from './LazyArg.js';
import {LifecycleWatcher, PuppeteerLifeCycleEvent} from './LifecycleWatcher.js';
import {TimeoutSettings} from './TimeoutSettings.js';
import {EvaluateFunc, HandleFor, NodeFor} from './types.js';
import {EvaluateFunc, HandleFor, InnerLazyParams, NodeFor} from './types.js';
import {createJSHandle, debugError, pageBindingInitString} from './util.js';
import {TaskManager, WaitTask} from './WaitTask.js';
import {MAIN_WORLD, PUPPETEER_WORLD} from './IsolatedWorlds.js';
@ -138,11 +138,8 @@ export class IsolatedWorld {
}
clearContext(): void {
// Only create a new promise if the old one was resolved.
if (this.#puppeteerUtil.resolved()) {
this.#puppeteerUtil = createDeferredPromise();
}
this.#document = undefined;
this.#puppeteerUtil = createDeferredPromise();
this.#context = createDeferredPromise();
}
@ -520,8 +517,13 @@ export class IsolatedWorld {
root,
timeout,
},
LazyArg.create(() => {
return this.puppeteerUtil;
new LazyArg(async () => {
try {
// In case CDP fails.
return await this.puppeteerUtil;
} catch {
return undefined;
}
}),
queryOne.toString(),
selector,
@ -545,7 +547,9 @@ export class IsolatedWorld {
waitForFunction<
Params extends unknown[],
Func extends EvaluateFunc<Params> = EvaluateFunc<Params>
Func extends EvaluateFunc<InnerLazyParams<Params>> = EvaluateFunc<
InnerLazyParams<Params>
>
>(
pageFunction: Func | string,
options: {

8
packages/puppeteer-core/src/common/LazyArg.ts
View File

@ -18,14 +18,8 @@
* @internal
*/
export class LazyArg<T> {
static create = <T>(callback: () => Promise<T>): T => {
// We do type coercion here because we don't want to introduce LazyArgs to
// the type system.
return new LazyArg(callback) as unknown as T;
};
#get: () => Promise<T>;
private constructor(get: () => Promise<T>) {
constructor(get: () => Promise<T>) {
this.#get = get;
}

14
packages/puppeteer-core/src/common/QueryHandler.ts
View File

@ -15,13 +15,11 @@
*/
import PuppeteerUtil from '../injected/injected.js';
import {assert} from '../util/assert.js';
import {ariaHandler} from './AriaQueryHandler.js';
import {ElementHandle} from './ElementHandle.js';
import {Frame} from './Frame.js';
import {WaitForSelectorOptions} from './IsolatedWorld.js';
import {MAIN_WORLD, PUPPETEER_WORLD} from './IsolatedWorlds.js';
import {LazyArg} from './LazyArg.js';
/**
* @public
@ -104,11 +102,7 @@ function createPuppeteerQueryHandler(
const jsHandle = await element.evaluateHandle(
queryOne,
selector,
LazyArg.create(() => {
const world = element.executionContext()._world;
assert(world);
return world.puppeteerUtil;
})
await element.executionContext()._world!.puppeteerUtil
);
const elementHandle = jsHandle.asElement();
if (elementHandle) {
@ -154,11 +148,7 @@ function createPuppeteerQueryHandler(
const jsHandle = await element.evaluateHandle(
queryAll,
selector,
LazyArg.create(() => {
const world = element.executionContext()._world;
assert(world);
return world.puppeteerUtil;
})
await element.executionContext()._world!.puppeteerUtil
);
const properties = await jsHandle.getProperties();
await jsHandle.dispose();

13
packages/puppeteer-core/src/common/WaitTask.ts
View File

@ -20,7 +20,6 @@ import {ElementHandle} from './ElementHandle.js';
import {TimeoutError} from './Errors.js';
import {IsolatedWorld} from './IsolatedWorld.js';
import {JSHandle} from './JSHandle.js';
import {LazyArg} from './LazyArg.js';
import {HandleFor} from './types.js';
/**
@ -115,9 +114,7 @@ export class WaitTask<T = unknown> {
return fun(...args) as Promise<T>;
});
},
LazyArg.create(() => {
return this.#world.puppeteerUtil;
}),
await this.#world.puppeteerUtil,
this.#fn,
...this.#args
);
@ -130,9 +127,7 @@ export class WaitTask<T = unknown> {
return fun(...args) as Promise<T>;
}, root || document);
},
LazyArg.create(() => {
return this.#world.puppeteerUtil;
}),
await this.#world.puppeteerUtil,
this.#root,
this.#fn,
...this.#args
@ -146,9 +141,7 @@ export class WaitTask<T = unknown> {
return fun(...args) as Promise<T>;
}, ms);
},
LazyArg.create(() => {
return this.#world.puppeteerUtil;
}),
await this.#world.puppeteerUtil,
this.#polling,
this.#fn,
...this.#args

13
packages/puppeteer-core/src/common/types.ts
View File

@ -16,6 +16,7 @@
import {JSHandle} from './JSHandle.js';
import {ElementHandle} from './ElementHandle.js';
import {LazyArg} from './LazyArg.js';
/**
* @public
@ -37,6 +38,18 @@ export type HandleOr<T> = HandleFor<T> | JSHandle<T> | T;
*/
export type FlattenHandle<T> = T extends HandleOr<infer U> ? U : never;
/**
* @internal
*/
export type FlattenLazyArg<T> = T extends LazyArg<infer U> ? U : T;
/**
* @internal
*/
export type InnerLazyParams<T extends unknown[]> = {
[K in keyof T]: FlattenLazyArg<T[K]>;
};
/**
* @public
*/

5
test/src/injected.spec.ts
View File

@ -16,7 +16,6 @@
import expect from 'expect';
import {PUPPETEER_WORLD} from 'puppeteer-core/internal/common/IsolatedWorlds.js';
import {LazyArg} from 'puppeteer-core/internal/common/LazyArg.js';
import {
getTestState,
setupTestBrowserHooks,
@ -46,9 +45,7 @@ describe('PuppeteerUtil tests', function () {
({createFunction}, fnString) => {
return createFunction(fnString)(4);
},
LazyArg.create(() => {
return world.puppeteerUtil;
}),
await world.puppeteerUtil,
(() => {
return 4;
}).toString()