wrapper: write stdout/stderr data to stream when received

This commit is contained in:
Austin Valle 2024-04-25 10:23:13 -04:00
parent 1f0219f06b
commit 003aea7b7b
4 changed files with 38 additions and 17 deletions

17
dist/index1.js vendored
View file

@ -27599,13 +27599,18 @@ module.exports = {
* console.log(listener.contents); * console.log(listener.contents);
*/ */
class OutputListener { class OutputListener {
constructor () { constructor (streamWriter) {
this._buff = []; this._buff = [];
this._streamWriter = streamWriter;
} }
get listener () { get listener () {
const listen = function listen (data) { const listen = function listen (data) {
this._buff.push(data); this._buff.push(data);
if (this._streamWriter) {
this._streamWriter.write(data);
}
}; };
return listen.bind(this); return listen.bind(this);
} }
@ -27946,9 +27951,9 @@ async function checkTerraform () {
// This will fail if Terraform isn't found, which is what we want // This will fail if Terraform isn't found, which is what we want
await checkTerraform(); await checkTerraform();
// Create listeners to receive output (in memory) as well // Create listeners to receive output (in memory)
const stdout = new OutputListener(); const stdout = new OutputListener(process.stdout);
const stderr = new OutputListener(); const stderr = new OutputListener(process.stderr);
const listeners = { const listeners = {
stdout: stdout.listener, stdout: stdout.listener,
stderr: stderr.listener stderr: stderr.listener
@ -27963,10 +27968,6 @@ async function checkTerraform () {
}; };
const exitCode = await exec(pathToCLI, args, options); const exitCode = await exec(pathToCLI, args, options);
// Pass-through stdout/err as `exec` won't due to `silent: true` option
process.stdout.write(stdout.contents);
process.stderr.write(stderr.contents);
// Set outputs, result, exitcode, and stderr // Set outputs, result, exitcode, and stderr
core.setOutput('stdout', stdout.contents); core.setOutput('stdout', stdout.contents);
core.setOutput('stderr', stderr.contents); core.setOutput('stderr', stderr.contents);

View file

@ -20,13 +20,18 @@
* console.log(listener.contents); * console.log(listener.contents);
*/ */
class OutputListener { class OutputListener {
constructor () { constructor (streamWriter) {
this._buff = []; this._buff = [];
this._streamWriter = streamWriter;
} }
get listener () { get listener () {
const listen = function listen (data) { const listen = function listen (data) {
this._buff.push(data); this._buff.push(data);
if (this._streamWriter) {
this._streamWriter.write(data);
}
}; };
return listen.bind(this); return listen.bind(this);
} }

View file

@ -21,9 +21,9 @@ async function checkTerraform () {
// This will fail if Terraform isn't found, which is what we want // This will fail if Terraform isn't found, which is what we want
await checkTerraform(); await checkTerraform();
// Create listeners to receive output (in memory) as well // Create listeners to receive output (in memory)
const stdout = new OutputListener(); const stdout = new OutputListener(process.stdout);
const stderr = new OutputListener(); const stderr = new OutputListener(process.stderr);
const listeners = { const listeners = {
stdout: stdout.listener, stdout: stdout.listener,
stderr: stderr.listener stderr: stderr.listener
@ -38,10 +38,6 @@ async function checkTerraform () {
}; };
const exitCode = await exec(pathToCLI, args, options); const exitCode = await exec(pathToCLI, args, options);
// Pass-through stdout/err as `exec` won't due to `silent: true` option
process.stdout.write(stdout.contents);
process.stderr.write(stderr.contents);
// Set outputs, result, exitcode, and stderr // Set outputs, result, exitcode, and stderr
core.setOutput('stdout', stdout.contents); core.setOutput('stdout', stdout.contents);
core.setOutput('stderr', stderr.contents); core.setOutput('stderr', stderr.contents);

View file

@ -6,12 +6,31 @@
const OutputListener = require('../lib/output-listener'); const OutputListener = require('../lib/output-listener');
describe('output-listener', () => { describe('output-listener', () => {
it('receives and exposes data', () => { it('receives and buffers data to .contents', () => {
const listener = new OutputListener(); const listener = new OutputListener();
const listen = listener.listener; const listen = listener.listener;
listen(Buffer.from('foo')); listen(Buffer.from('foo'));
listen(Buffer.from('bar')); listen(Buffer.from('bar'));
listen(Buffer.from('baz')); listen(Buffer.from('baz'));
expect(listener.contents).toEqual('foobarbaz'); expect(listener.contents).toEqual('foobarbaz');
}); });
it('receives and writes data to stream immediately', () => {
const mockWrite = jest.fn();
const listener = new OutputListener({ write: mockWrite });
const listen = listener.listener;
listen(Buffer.from('first write'));
expect(mockWrite.mock.lastCall[0]).toStrictEqual(Buffer.from('first write'));
listen(Buffer.from('second write'));
expect(mockWrite.mock.lastCall[0]).toStrictEqual(Buffer.from('second write'));
listen(Buffer.from('third write'));
expect(mockWrite.mock.lastCall[0]).toStrictEqual(Buffer.from('third write'));
expect(mockWrite).toBeCalledTimes(3);
});
}); });