From 17a2c339ea4bb8ab2d57f7e60633974ed07aaa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sautter?= <joerg.sautter@gmx.net>
Date: Thu, 28 Nov 2024 18:03:04 +0100
Subject: [PATCH] [java] read complete output of selenium manager #14820

---
 .../selenium/manager/SeleniumManager.java     |  5 ++-
 .../openqa/selenium/os/ExternalProcess.java   | 38 +++++++++++++------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/java/src/org/openqa/selenium/manager/SeleniumManager.java b/java/src/org/openqa/selenium/manager/SeleniumManager.java
index b907d8ab755ec..97e23c85f4cb6 100644
--- a/java/src/org/openqa/selenium/manager/SeleniumManager.java
+++ b/java/src/org/openqa/selenium/manager/SeleniumManager.java
@@ -123,7 +123,10 @@ private static Result runCommand(Path binary, List<String> arguments) {
     String output;
     int code;
     try {
-      ExternalProcess.Builder processBuilder = ExternalProcess.builder();
+      ExternalProcess.Builder processBuilder =
+          ExternalProcess.builder()
+              // keep all output of the process to avoid JSON syntax errors while parsing
+              .bufferSize(-1);
 
       Properties properties = System.getProperties();
       for (String name : properties.stringPropertyNames()) {
diff --git a/java/src/org/openqa/selenium/os/ExternalProcess.java b/java/src/org/openqa/selenium/os/ExternalProcess.java
index 2bbb7ceb01b9c..e4ae0ec9c46fa 100644
--- a/java/src/org/openqa/selenium/os/ExternalProcess.java
+++ b/java/src/org/openqa/selenium/os/ExternalProcess.java
@@ -19,6 +19,7 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -159,8 +160,8 @@ public Builder directory(File directory) {
     }
 
     /**
-     * Where to copy the combined stdout and stderr output to, {@code OsProcess#getOutput} is still
-     * working when called.
+     * Where to copy the combined stdout and stderr output to, {@code ExternalProcess#getOutput} is
+     * still working when called.
      *
      * @param stream where to copy the combined output to
      * @return this instance to continue building
@@ -172,9 +173,9 @@ public Builder copyOutputTo(OutputStream stream) {
     }
 
     /**
-     * The number of bytes to buffer for {@code OsProcess#getOutput} calls.
+     * The number of bytes to buffer for {@code ExternalProcess#getOutput} calls.
      *
-     * @param toKeep the number of bytes, default is 4096
+     * @param toKeep the number of bytes, default is 32768
      * @return this instance to continue building
      */
     public Builder bufferSize(int toKeep) {
@@ -195,13 +196,19 @@ public ExternalProcess start() throws UncheckedIOException {
       }
 
       try {
-        CircularOutputStream circular = new CircularOutputStream(bufferSize);
+        OutputStream buffer;
+
+        if (bufferSize != -1) {
+          buffer = new CircularOutputStream(bufferSize);
+        } else {
+          buffer = new ByteArrayOutputStream();
+        }
 
         Thread worker =
             new Thread(
                 () -> {
                   // copyOutputTo might be system.out or system.err, do not to close
-                  OutputStream output = new MultiOutputStream(circular, copyOutputTo);
+                  OutputStream output = new MultiOutputStream(buffer, copyOutputTo);
                   // closing the InputStream does somehow disturb the process, do not to close
                   InputStream input = process.getInputStream();
                   // use the CircularOutputStream as mandatory, we know it will never raise a
@@ -221,7 +228,7 @@ public ExternalProcess start() throws UncheckedIOException {
         worker.setDaemon(true);
         worker.start();
 
-        return new ExternalProcess(process, circular, worker);
+        return new ExternalProcess(process, buffer, worker);
       } catch (Throwable t) {
         // ensure we do not leak a process in case of failures
         try {
@@ -239,10 +246,10 @@ public static Builder builder() {
   }
 
   private final Process process;
-  private final CircularOutputStream outputStream;
+  private final OutputStream outputStream;
   private final Thread worker;
 
-  public ExternalProcess(Process process, CircularOutputStream outputStream, Thread worker) {
+  public ExternalProcess(Process process, OutputStream outputStream, Thread worker) {
     this.process = process;
     this.outputStream = outputStream;
     this.worker = worker;
@@ -250,7 +257,7 @@ public ExternalProcess(Process process, CircularOutputStream outputStream, Threa
 
   /**
    * The last N bytes of the combined stdout and stderr as String, the value of N is set while
-   * building the OsProcess.
+   * building the ExternalProcess.
    *
    * @return stdout and stderr as String in Charset.defaultCharset() encoding
    */
@@ -260,13 +267,20 @@ public String getOutput() {
 
   /**
    * The last N bytes of the combined stdout and stderr as String, the value of N is set while
-   * building the OsProcess.
+   * building the ExternalProcess.
    *
    * @param encoding the encoding to decode the stream
    * @return stdout and stderr as String in the given encoding
    */
   public String getOutput(Charset encoding) {
-    return outputStream.toString(encoding);
+    if (outputStream instanceof CircularOutputStream) {
+      return ((CircularOutputStream) outputStream).toString(encoding);
+    } else if (outputStream instanceof ByteArrayOutputStream) {
+      return ((ByteArrayOutputStream) outputStream).toString(encoding);
+    } else {
+      throw new IllegalStateException(
+          "unexpected OutputStream implementation: " + outputStream.getClass().getSimpleName());
+    }
   }
 
   public boolean isAlive() {