mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fix: use Node's microtasks policy in node_main.cc (#23154)
Fixes #21515.
This commit is contained in:
@@ -89,6 +89,7 @@ int NodeMain(int argc, char* argv[]) {
|
||||
JavascriptEnvironment gin_env(loop);
|
||||
|
||||
v8::Isolate* isolate = gin_env.isolate();
|
||||
isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
|
||||
|
||||
node::IsolateData* isolate_data =
|
||||
node::CreateIsolateData(isolate, loop, gin_env.platform());
|
||||
|
||||
@@ -260,4 +260,17 @@ describe('node feature', () => {
|
||||
const result = childProcess.spawnSync(process.execPath, [path.resolve(fixtures, 'api', 'electron-main-module', 'app.asar')]);
|
||||
expect(result.status).to.equal(0);
|
||||
});
|
||||
|
||||
it('handles Promise timeouts correctly', (done) => {
|
||||
const scriptPath = path.join(fixtures, 'module', 'node-promise-timer.js');
|
||||
const child = childProcess.spawn(process.execPath, [scriptPath], {
|
||||
env: { ELECTRON_RUN_AS_NODE: 'true' }
|
||||
});
|
||||
emittedOnce(child, 'exit').then(([code, signal]) => {
|
||||
expect(code).to.equal(0);
|
||||
expect(signal).to.equal(null);
|
||||
child.kill();
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
23
spec/fixtures/module/node-promise-timer.js
vendored
Normal file
23
spec/fixtures/module/node-promise-timer.js
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
const waitMs = (msec) => new Promise((resolve) => setTimeout(resolve, msec));
|
||||
|
||||
const intervalMsec = 100;
|
||||
const numIterations = 2;
|
||||
let curIteration = 0;
|
||||
let promise;
|
||||
|
||||
for (let i = 0; i < numIterations; i++) {
|
||||
promise = (promise || waitMs(intervalMsec)).then(() => {
|
||||
++curIteration;
|
||||
return waitMs(intervalMsec);
|
||||
});
|
||||
}
|
||||
|
||||
// https://github.com/electron/electron/issues/21515 was about electron
|
||||
// exiting before promises finished. This test sets the pending exitCode
|
||||
// to failure, then resets it to success only if all promises finish.
|
||||
process.exitCode = 1;
|
||||
promise.then(() => {
|
||||
if (curIteration === numIterations) {
|
||||
process.exitCode = 0;
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user