match existing behaviour when custom listeners defined

This commit is contained in:
Nick Fyson 2020-08-24 18:35:22 +01:00
parent 2b27c68c84
commit 45e00a8e6a
3 changed files with 30 additions and 13 deletions

23
lib/exec_wrapper.js generated
View file

@ -15,17 +15,26 @@ async function exec_wrapper(commandLine, args, options) {
let stderr = '';
let listeners = {
stdout: (data) => {
var _a, _b, _c;
var _a;
stdout += data.toString();
// NB change behaviour to only write to stdout/err if no listener passed
process.stdout.write(data);
(_c = (_a = originalListener) === null || _a === void 0 ? void 0 : (_b = _a).stdout) === null || _c === void 0 ? void 0 : _c.call(_b, data);
if (((_a = originalListener) === null || _a === void 0 ? void 0 : _a.stdout) !== undefined) {
originalListener.stdout(data);
}
else {
// if no stdout listener was originally defined then match behaviour of exec.exec
process.stdout.write(data);
}
},
stderr: (data) => {
var _a, _b, _c;
var _a;
stderr += data.toString();
process.stderr.write(data);
(_c = (_a = originalListener) === null || _a === void 0 ? void 0 : (_b = _a).stderr) === null || _c === void 0 ? void 0 : _c.call(_b, data);
if (((_a = originalListener) === null || _a === void 0 ? void 0 : _a.stderr) !== undefined) {
originalListener.stderr(data);
}
else {
// if no stderr listener was originally defined then match behaviour of exec.exec
process.stderr.write(data);
}
}
};
const returnCode = await exec.exec(commandLine, args, {