github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move setContent to common impl (#11455)

Browse Source 
Co-authored-by: Alex Rudenko <alexrudenko@chromium.org>
This commit is contained in:
Nikolay Vitkov 2023-11-29 18:25:54 +01:00 committed by GitHub
parent 1014abc087
commit 8be3e797bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/puppeteer-core/src/api/Frame.ts
View File

@ -804,6 +804,17 @@ export abstract class Frame extends EventEmitter<FrameEvents> {
} }
): Promise<void>; ): Promise<void>;
/**
* @internal
*/
async setFrameContent(content: string): Promise<void> {
return await this.evaluate(html => {
document.open();
document.write(html);
document.close();
}, content);
}
/** /**
* The frame's `name` attribute as specified in the tag. * The frame's `name` attribute as specified in the tag.
* *

4
packages/puppeteer-core/src/bidi/Frame.ts
View File

@ -39,7 +39,7 @@ import type {WaitForSelectorOptions} from '../api/Page.js';
import {UnsupportedOperation} from '../common/Errors.js'; import {UnsupportedOperation} from '../common/Errors.js';
import type {TimeoutSettings} from '../common/TimeoutSettings.js'; import type {TimeoutSettings} from '../common/TimeoutSettings.js';
import type {Awaitable, NodeFor} from '../common/types.js'; import type {Awaitable, NodeFor} from '../common/types.js';
import {UTILITY_WORLD_NAME, setPageContent, timeout} from '../common/util.js'; import {UTILITY_WORLD_NAME, timeout} from '../common/util.js';
import {Deferred} from '../util/Deferred.js'; import {Deferred} from '../util/Deferred.js';
import {disposeSymbol} from '../util/disposable.js'; import {disposeSymbol} from '../util/disposable.js';
@ -174,7 +174,7 @@ export class BidiFrame extends Frame {
._waitWithNetworkIdle( ._waitWithNetworkIdle(
forkJoin([ forkJoin([
fromEvent(this.#context, waitEvent).pipe(first()), fromEvent(this.#context, waitEvent).pipe(first()),
from(setPageContent(this, html)), from(this.setFrameContent(html)),
]).pipe( ]).pipe(
map(() => { map(() => {
return null; return null;

5
packages/puppeteer-core/src/cdp/Frame.ts
View File

@ -21,7 +21,6 @@ import {Frame, FrameEvent, throwIfDetached} from '../api/Frame.js';
import type {HTTPResponse} from '../api/HTTPResponse.js'; import type {HTTPResponse} from '../api/HTTPResponse.js';
import type {WaitTimeoutOptions} from '../api/Page.js'; import type {WaitTimeoutOptions} from '../api/Page.js';
import {UnsupportedOperation} from '../common/Errors.js'; import {UnsupportedOperation} from '../common/Errors.js';
import {setPageContent} from '../common/util.js';
import {Deferred} from '../util/Deferred.js'; import {Deferred} from '../util/Deferred.js';
import {disposeSymbol} from '../util/disposable.js'; import {disposeSymbol} from '../util/disposable.js';
import {isErrorLike} from '../util/ErrorLike.js'; import {isErrorLike} from '../util/ErrorLike.js';
@ -262,7 +261,9 @@ export class CdpFrame extends Frame {
timeout = this._frameManager.timeoutSettings.navigationTimeout(), timeout = this._frameManager.timeoutSettings.navigationTimeout(),
} = options; } = options;
await setPageContent(this.isolatedRealm(), html); // We rely upon the fact that document.open() will reset frame lifecycle with "init"
// lifecycle event. @see https://crrev.com/608658
await this.setFrameContent(html);
const watcher = new LifecycleWatcher( const watcher = new LifecycleWatcher(
this._frameManager.networkManager, this._frameManager.networkManager,

17
packages/puppeteer-core/src/common/util.ts
View File

@ -31,7 +31,6 @@ import {
raceWith, raceWith,
} from '../../third_party/rxjs/rxjs.js'; } from '../../third_party/rxjs/rxjs.js';
import type {CDPSession} from '../api/CDPSession.js'; import type {CDPSession} from '../api/CDPSession.js';
import type {Page} from '../api/Page.js';
import {isNode} from '../environment.js'; import {isNode} from '../environment.js';
import {assert} from '../util/assert.js'; import {assert} from '../util/assert.js';
import type {Deferred} from '../util/Deferred.js'; import type {Deferred} from '../util/Deferred.js';
@ -504,22 +503,6 @@ export async function getReadableFromProtocolStream(
}); });
} }
/**
* @internal
*/
export async function setPageContent(
page: Pick<Page, 'evaluate'>,
content: string
): Promise<void> {
// We rely upon the fact that document.open() will reset frame lifecycle with "init"
// lifecycle event. @see https://crrev.com/608658
return await page.evaluate(html => {
document.open();
document.write(html);
document.close();
}, content);
}
/** /**
* @internal * @internal
*/ */