Skip to content

Commit

Permalink
fix: use Node's microtasks policy in node_main.cc (#23154)
Browse files Browse the repository at this point in the history
Fixes #21515.
  • Loading branch information
ckerr committed Apr 21, 2020
1 parent b35a98c commit 74d391b
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 0 deletions.
1 change: 1 addition & 0 deletions shell/app/node_main.cc
Expand Up @@ -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());
Expand Down
13 changes: 13 additions & 0 deletions spec-main/node-spec.ts
Expand Up @@ -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 changes: 23 additions & 0 deletions spec/fixtures/module/node-promise-timer.js
@@ -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;
}
});

0 comments on commit 74d391b

Please sign in to comment.