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

fix(electron): deliver promised _nodeElectronHandle (#6348)

Browse source
This commit is contained in:
Gnome Bard 2021-05-01 09:46:27 +08:00 committed by GitHub
parent de21a94b75
commit 018f3146a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dispatchers/electronDispatcher.ts
View file

@ -50,12 +50,12 @@ export class ElectronApplicationDispatcher extends Dispatcher<ElectronApplicatio
} }
async evaluateExpression(params: channels.ElectronApplicationEvaluateExpressionParams): Promise<channels.ElectronApplicationEvaluateExpressionResult> { async evaluateExpression(params: channels.ElectronApplicationEvaluateExpressionParams): Promise<channels.ElectronApplicationEvaluateExpressionResult> {
const handle = this._object._nodeElectronHandle!; const handle = await this._object._nodeElectronHandlePromised;
return { value: serializeResult(await handle.evaluateExpressionAndWaitForSignals(params.expression, params.isFunction, true /* returnByValue */, parseArgument(params.arg))) }; return { value: serializeResult(await handle.evaluateExpressionAndWaitForSignals(params.expression, params.isFunction, true /* returnByValue */, parseArgument(params.arg))) };
} }
async evaluateExpressionHandle(params: channels.ElectronApplicationEvaluateExpressionHandleParams): Promise<channels.ElectronApplicationEvaluateExpressionHandleResult> { async evaluateExpressionHandle(params: channels.ElectronApplicationEvaluateExpressionHandleParams): Promise<channels.ElectronApplicationEvaluateExpressionHandleResult> {
const handle = this._object._nodeElectronHandle!; const handle = await this._object._nodeElectronHandlePromised;
const result = await handle.evaluateExpressionAndWaitForSignals(params.expression, params.isFunction, false /* returnByValue */, parseArgument(params.arg)); const result = await handle.evaluateExpressionAndWaitForSignals(params.expression, params.isFunction, false /* returnByValue */, parseArgument(params.arg));
return { handle: ElementHandleDispatcher.fromJSHandle(this._scope, result) }; return { handle: ElementHandleDispatcher.fromJSHandle(this._scope, result) };
} }

11
src/server/electron/electron.ts
View file

@ -58,7 +58,8 @@ export class ElectronApplication extends SdkObject {
private _nodeConnection: CRConnection; private _nodeConnection: CRConnection;
private _nodeSession: CRSession; private _nodeSession: CRSession;
private _nodeExecutionContext: js.ExecutionContext | undefined; private _nodeExecutionContext: js.ExecutionContext | undefined;
_nodeElectronHandle: js.JSHandle<any> | undefined; _nodeElectronHandlePromised: Promise<js.JSHandle<any>>;
private _resolveNodeElectronHandle!: (handle: js.JSHandle<any>) => void;
private _windows = new Set<ElectronPage>(); private _windows = new Set<ElectronPage>();
private _lastWindowId = 0; private _lastWindowId = 0;
readonly _timeoutSettings = new TimeoutSettings(); readonly _timeoutSettings = new TimeoutSettings();
@ -73,6 +74,7 @@ export class ElectronApplication extends SdkObject {
this._browserContext.on(BrowserContext.Events.Page, event => this._onPage(event)); this._browserContext.on(BrowserContext.Events.Page, event => this._onPage(event));
this._nodeConnection = nodeConnection; this._nodeConnection = nodeConnection;
this._nodeSession = nodeConnection.rootSession; this._nodeSession = nodeConnection.rootSession;
this._nodeElectronHandlePromised = new Promise(resolve => this._resolveNodeElectronHandle = resolve);
} }
private async _onPage(page: ElectronPage) { private async _onPage(page: ElectronPage) {
@ -87,7 +89,7 @@ export class ElectronApplication extends SdkObject {
this._windows.add(page); this._windows.add(page);
// Below is async. // Below is async.
const handle = await this._nodeElectronHandle!.evaluateHandle(({ BrowserWindow }, windowId) => BrowserWindow.fromId(windowId), windowId).catch(e => {}); const handle = await (await this._nodeElectronHandlePromised).evaluateHandle(({ BrowserWindow }, windowId) => BrowserWindow.fromId(windowId), windowId).catch(e => {});
if (!handle) if (!handle)
return; return;
page.browserWindow = handle; page.browserWindow = handle;
@ -103,7 +105,7 @@ export class ElectronApplication extends SdkObject {
async close() { async close() {
const progressController = new ProgressController(internalCallMetadata(), this); const progressController = new ProgressController(internalCallMetadata(), this);
const closed = progressController.run(progress => helper.waitForEvent(progress, this, ElectronApplication.Events.Close).promise, this._timeoutSettings.timeout({})); const closed = progressController.run(progress => helper.waitForEvent(progress, this, ElectronApplication.Events.Close).promise, this._timeoutSettings.timeout({}));
await this._nodeElectronHandle!.evaluate(({ app }) => app.quit()); await (await this._nodeElectronHandlePromised).evaluate(({ app }) => app.quit());
this._nodeConnection.close(); this._nodeConnection.close();
await closed; await closed;
} }
@ -114,7 +116,8 @@ export class ElectronApplication extends SdkObject {
this._nodeExecutionContext = new js.ExecutionContext(this, new CRExecutionContext(this._nodeSession, event.context)); this._nodeExecutionContext = new js.ExecutionContext(this, new CRExecutionContext(this._nodeSession, event.context));
}); });
await this._nodeSession.send('Runtime.enable', {}).catch(e => {}); await this._nodeSession.send('Runtime.enable', {}).catch(e => {});
this._nodeElectronHandle = await js.evaluate(this._nodeExecutionContext!, false /* returnByValue */, `process.mainModule.require('electron')`); js.evaluate(this._nodeExecutionContext!, false /* returnByValue */, `process.mainModule.require('electron')`)
.then(this._resolveNodeElectronHandle);
} }
} }