CLI: Wait for both the 'end' and 'close' event to happen before finis…

…hing in pbts, see protobufjs#863
Szpadel · Jul 25, 2017 · 548b1bd · 548b1bd
1 parent afe3d14
commit 548b1bd
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/cli/pbts.js b/cli/pbts.js
@@ -106,9 +106,15 @@ exports.main = function(args, callback) {
             maxBuffer: 1 << 24 // 16mb
         });
         var out = [];
+        var ended = false;
+        var closed = false;
         child.stdout.on("data", function(data) {
             out.push(data);
         });
+        child.stdout.on("end", function() {
+            if (closed) finish();
+            else ended = true;
+        });
         child.stderr.pipe(process.stderr);
         child.on("close", function(code) {
             // clean up temporary files, no matter what
@@ -123,6 +129,11 @@ exports.main = function(args, callback) {
                 throw err;
             }
 
+            if (ended) finish();
+            else closed = true;
+        });
+
+        function finish() {
             var output = [];
             if (argv.global)
                 output.push(
@@ -149,7 +160,7 @@ exports.main = function(args, callback) {
                     return callback(err);
                 throw err;
             }
-        });
+        }
     }
 
     return undefined;