Defending pana log writes from cross-stream data + extra logging.

Author: isoos

pkg/pub_worker/lib/src/analyze.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:convert' show JsonUtf8Encoder, utf8;
+import 'dart:convert' show JsonUtf8Encoder, LineSplitter, utf8;
 import 'dart:io'
     show Directory, File, IOException, Platform, Process, ProcessSignal, gzip;
 import 'dart:isolate' show Isolate;
@@ -152,12 +152,28 @@ Future<void> _analyzePackage(
       await pana.stdin.close();
 
       await Future.wait<void>([
-        pana.stderr.forEach(log.add),
-        pana.stdout.forEach(log.add),
+        pana.stderr
+            .transform(utf8.decoder)
+            .transform(LineSplitter())
+            .forEach(log.writeln),
+        pana.stdout
+            .transform(utf8.decoder)
+            .transform(LineSplitter())
+            .forEach(log.writeln),
         pana.exitOrTimeout(_panaTimeout, () {
           log.writeln('TIMEOUT: pana sending SIGTERM/SIGKILL');
         }),
-      ]).catchError((e) => const [/* ignore */]);
+      ]).catchError((e, st) {
+        log.writeln('Error waiting for pana process: $e');
+        log.writeln(st);
+        // kill the process if not already killed
+        try {
+          pana.kill(ProcessSignal.sigkill);
+        } finally {
+          // ignore
+        }
+        return const [];
+      });
       final exitCode = await pana.exitCode;
 
       log.writeln('### Execution of pana exited $exitCode');