feat: remove on(ready) requirement from powerMonitor (#37937)

This commit is contained in:
Jeremy Rose 2023-04-12 15:37:52 -07:00 коммит произвёл GitHub
Родитель 908bef7ca9
Коммит fef1b04238
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 25 добавлений и 24 удалений

Просмотреть файл

@ -1,5 +1,4 @@
import { EventEmitter } from 'events';
import { app } from 'electron/main';
const {
createPowerMonitor,
@ -14,28 +13,26 @@ class PowerMonitor extends EventEmitter {
// Don't start the event source until both a) the app is ready and b)
// there's a listener registered for a powerMonitor event.
this.once('newListener', () => {
app.whenReady().then(() => {
const pm = createPowerMonitor();
pm.emit = this.emit.bind(this);
const pm = createPowerMonitor();
pm.emit = this.emit.bind(this);
if (process.platform === 'linux') {
// On Linux, we inhibit shutdown in order to give the app a chance to
// decide whether or not it wants to prevent the shutdown. We don't
// inhibit the shutdown event unless there's a listener for it. This
// keeps the C++ code informed about whether there are any listeners.
pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
this.on('newListener', (event) => {
if (event === 'shutdown') {
pm.setListeningForShutdown(this.listenerCount('shutdown') + 1 > 0);
}
});
this.on('removeListener', (event) => {
if (event === 'shutdown') {
pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
}
});
}
});
if (process.platform === 'linux') {
// On Linux, we inhibit shutdown in order to give the app a chance to
// decide whether or not it wants to prevent the shutdown. We don't
// inhibit the shutdown event unless there's a listener for it. This
// keeps the C++ code informed about whether there are any listeners.
pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
this.on('newListener', (event) => {
if (event === 'shutdown') {
pm.setListeningForShutdown(this.listenerCount('shutdown') + 1 > 0);
}
});
this.on('removeListener', (event) => {
if (event === 'shutdown') {
pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
}
});
}
});
}

Просмотреть файл

@ -91,7 +91,6 @@ void PowerMonitor::SetListeningForShutdown(bool is_listening) {
// static
v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
CHECK(Browser::Get()->is_ready());
auto* pm = new PowerMonitor(isolate);
auto handle = gin::CreateHandle(isolate, pm).ToV8();
pm->Pin(isolate);

Просмотреть файл

@ -8,7 +8,7 @@
// python-dbusmock.
import { expect } from 'chai';
import * as dbus from 'dbus-native';
import { ifdescribe } from './lib/spec-helpers';
import { ifdescribe, startRemoteControlApp } from './lib/spec-helpers';
import { promisify } from 'util';
import { setTimeout } from 'timers/promises';
@ -135,6 +135,11 @@ describe('powerMonitor', () => {
});
});
it('is usable before app ready', async () => {
const remoteApp = await startRemoteControlApp(['--boot-eval=globalThis.initialValue=require("electron").powerMonitor.getSystemIdleTime()']);
expect(await remoteApp.remoteEval('globalThis.initialValue')).to.be.a('number');
});
describe('when powerMonitor module is loaded', () => {
// eslint-disable-next-line no-undef
let powerMonitor: typeof Electron.powerMonitor;