Skip to content

Commit

Permalink
fix(electron): allow using pre-ready apis (#19599)
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelfeldman committed Dec 20, 2022
1 parent d7e7cab commit 971e304
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 17 deletions.
37 changes: 20 additions & 17 deletions packages/playwright-core/src/server/electron/loader.ts
Expand Up @@ -31,27 +31,30 @@ for (const arg of chromiumSwitches) {
app.commandLine.appendSwitch(match[1], match[2]);
}

// Defer ready event.
const originalWhenReady = app.whenReady();
const originalEmit = app.emit.bind(app);
let readyEventArgs: any[];
app.emit = (event: string | symbol, ...args: any[]): boolean => {
if (event === 'ready') {
readyEventArgs = args;
return app.listenerCount('ready') > 0;
}
return originalEmit(event, ...args);
};
app.getAppPath = () => path.dirname(appPath);
let isReady = false;
let whenReadyCallback: (event: any) => any;
const whenReadyPromise = new Promise<void>(f => whenReadyCallback = f);
app.isReady = () => isReady;
app.whenReady = () => whenReadyPromise;

let launchInfoEventPayload: any;
app.on('ready', launchInfo => launchInfoEventPayload = launchInfo);
require(appPath);

(globalThis as any).__playwright_run = async () => {
// Wait for app to be ready to avoid browser initialization races.
await app.whenReady();

// Override isReady pipeline.
let isReady = false;
let whenReadyCallback: () => void;
const whenReadyPromise = new Promise<void>(f => whenReadyCallback = f);
app.isReady = () => isReady;
app.whenReady = () => whenReadyPromise;

require(appPath);

// Trigger isReady.
const event = await originalWhenReady;
isReady = true;
whenReadyCallback!();
app.emit('will-finish-launching');
app.emit('ready', launchInfoEventPayload);
whenReadyCallback(event);
originalEmit('ready', ...readyEventArgs);
};
3 changes: 3 additions & 0 deletions tests/electron/electron-app.js
@@ -1,6 +1,9 @@
const { app, protocol } = require('electron');
const path = require('path');

// Test using pre-ready apis.
protocol.registerSchemesAsPrivileged([]);

app.on('window-all-closed', e => e.preventDefault());

app.whenReady().then(() => {
Expand Down

0 comments on commit 971e304

Please sign in to comment.