dillonkearns/elm-pages
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages.git synced 2024-09-11 09:05:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle race condition with CLI commands that throw errors.

Browse Source
This commit is contained in:
Dillon Kearns 2024-04-24 08:55:58 -07:00
parent f64375ebc6
commit 6679f0bbc8
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/end-to-end/script/src/StreamTests.elm
View File

@ -203,6 +203,12 @@ b =
(\() ->
Expect.pass
)
, Script.exec "does-not-exist-exec" []
|> expectError "exec with non-0 fails"
"Error: spawn does-not-exist-exec ENOENT"
, Script.command "does-not-exist-command" []
|> expectError "command with non-0 fails"
"Error: spawn does-not-exist-command ENOENT"
]

24
generator/src/render.js
View File

@ -628,6 +628,8 @@ function runStream(req, portsFile) {
);
} else if (kind === "none") {
if (!lastStream) {
// ensure all error handling gets a chance to fire before resolving successfully
await tryCallingFunction(metadataResponse);
resolve(jsonResponse(req, { body: null }));
} else {
let resolvedMeta = await tryCallingFunction(metadataResponse);
@ -742,6 +744,7 @@ function runStream(req, portsFile) {
const newLocal = fs.createWriteStream(destinationPath);
newLocal.once("error", (error) => {
newLocal.close();
newLocal.removeAllListeners();
resolve({ error: error.toString() });
});
return {
@ -798,10 +801,6 @@ function runStream(req, portsFile) {
env: env,
});
newProcess.once("error", (error) => {
resolve({ error: error.toString() });
});
pipeIfPossible(lastStream, newProcess.stdin);
let newStream;
if (output === "MergeWithStdout") {
@ -811,12 +810,25 @@ function runStream(req, portsFile) {
} else {
newStream = newProcess.stdout;
}
newProcess.once("error", (error) => {
newStream && newStream.end();
newProcess.removeAllListeners();
resolve({ error: error.toString() });
});
if (isLastProcess) {
return {
stream: newStream,
metadata: new Promise((resolve) => {
metadata: new Promise((resoveMeta) => {
newProcess.once("exit", (code) => {
resolve({
if (code !== 0 && !allowNon0Status) {
newStream && newStream.end();
resolve({
error: `Command ${command} exited with code ${code}`,
});
}
resoveMeta({
exitCode: code,
});
});