mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Jeremy Rose 2023-04-12 15:37:52 -07:00 committed by GitHub
parent 908bef7ca9
commit fef1b04238
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/browser/api/power-monitor.ts
View file

@ -1,5 +1,4 @@
import { EventEmitter } from 'events';
import { app } from 'electron/main';
const {
createPowerMonitor,
@ -14,7 +13,6 @@ 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);
@ -36,7 +34,6 @@ class PowerMonitor extends EventEmitter {
});
}
});
});
}
getSystemIdleState (idleThreshold: number) {

1
shell/browser/api/electron_api_power_monitor.cc
View file

@ -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);

7
spec/api-power-monitor-spec.ts
View file

@ -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;