fix: use Node's microtasks policy in node_main.cc (#23154) (#23324)

Fixes #21515.
This commit is contained in:
Charles Kerr
2020-04-29 01:15:28 -05:00
committed by GitHub
parent 8148b76efa
commit 69683def0d
3 changed files with 37 additions and 0 deletions

View File

@@ -78,6 +78,7 @@ int NodeMain(int argc, char* argv[]) {
// Initialize gin::IsolateHolder.
JavascriptEnvironment gin_env(loop);
gin_env.isolate()->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
node::IsolateData* isolate_data =
node::CreateIsolateData(gin_env.isolate(), loop, gin_env.platform());

View 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;
}
});

View File

@@ -690,4 +690,17 @@ describe('node feature', () => {
const result = ChildProcess.spawnSync(remote.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();
});
});
});