Improve dumb terminal detection

Author: jpenilla

endermux-client/src/main/java/xyz/jpenilla/endermux/client/runtime/RemoteConsoleSession.java

@@ -212,6 +212,10 @@ private boolean acceptInputDumb() {
         if (this.connectedClient() == null || this.shutdownRequested.getAsBoolean()) {
           return false;
         }
+        if (!this.terminalContext.hasConsoleInput()) {
+          this.sleepForInput();
+          continue;
+        }
         LOGGER.info("Disconnecting...");
         return true;
       }
@@ -224,6 +228,16 @@ private boolean acceptInputDumb() {
     }
   }
 
+  private void sleepForInput() {
+    try {
+      Thread.sleep(SOCKET_POLL_INTERVAL_MS);
+    } catch (final InterruptedException e) {
+      if (!this.shutdownRequested.getAsBoolean()) {
+        LOGGER.debug("Interrupted while waiting for stdin input", e);
+      }
+    }
+  }
+
   private @Nullable String readInputLine(final BufferedReader reader) throws IOException {
     while (true) {
       if (this.shutdownRequested.getAsBoolean() || this.connectedClient() == null) {
@@ -232,13 +246,9 @@ private boolean acceptInputDumb() {
       if (reader.ready()) {
         return reader.readLine();
       }
-      try {
-        Thread.sleep(SOCKET_POLL_INTERVAL_MS);
-      } catch (final InterruptedException e) {
-        if (this.shutdownRequested.getAsBoolean()) {
-          return null;
-        }
-        LOGGER.debug("Interrupted while waiting for stdin input", e);
+      this.sleepForInput();
+      if (this.shutdownRequested.getAsBoolean()) {
+        return null;
       }
     }
   }

endermux-client/src/main/java/xyz/jpenilla/endermux/client/runtime/TerminalRuntimeContext.java

@@ -15,35 +15,54 @@
 import xyz.jpenilla.endermux.client.parser.RemoteParser;
 import xyz.jpenilla.endermux.client.transport.SocketTransport;
 import xyz.jpenilla.endermux.jline.MinecraftCompletionMatcher;
-import xyz.jpenilla.endermux.jline.TerminalDetection;
+import xyz.jpenilla.endermux.jline.TerminalMode;
+import xyz.jpenilla.endermux.jline.TerminalModeDetection;
 
 @NullMarked
 final class TerminalRuntimeContext implements AutoCloseable {
   private static final Logger LOGGER = LoggerFactory.getLogger(TerminalRuntimeContext.class);
-  private final boolean dumbTerminal;
+  private final TerminalMode mode;
+  private final boolean consoleInputAvailable;
   private final @Nullable Terminal terminal;
 
-  private TerminalRuntimeContext(final boolean dumbTerminal, final @Nullable Terminal terminal) {
-    this.dumbTerminal = dumbTerminal;
+  private TerminalRuntimeContext(
+    final TerminalMode mode,
+    final boolean consoleInputAvailable,
+    final @Nullable Terminal terminal
+  ) {
+    this.mode = mode;
+    this.consoleInputAvailable = consoleInputAvailable;
     this.terminal = terminal;
   }
 
-  static TerminalRuntimeContext create() throws IOException {
-    final boolean dumb = TerminalDetection.isDumb();
-    final @Nullable Terminal terminal;
-    if (dumb) {
-      terminal = null;
-    } else {
-      terminal = TerminalBuilder.builder()
+  static TerminalRuntimeContext create() {
+    final boolean consoleInputAvailable = TerminalModeDetection.hasConsoleInput();
+    final TerminalMode detectedMode = TerminalModeDetection.mode();
+    if (detectedMode == TerminalMode.DUMB) {
+      TerminalOutput.setTerminal(null);
+      return new TerminalRuntimeContext(TerminalMode.DUMB, consoleInputAvailable, null);
+    }
+
+    try {
+      final Terminal terminal = TerminalBuilder.builder()
         .system(true)
+        .dumb(false)
         .build();
+      TerminalOutput.setTerminal(terminal);
+      return new TerminalRuntimeContext(TerminalMode.INTERACTIVE, consoleInputAvailable, terminal);
+    } catch (final IOException | IllegalStateException e) {
+      LOGGER.debug("Falling back to dumb mode after interactive terminal setup failure", e);
+      TerminalOutput.setTerminal(null);
+      return new TerminalRuntimeContext(TerminalMode.DUMB, consoleInputAvailable, null);
     }
-    TerminalOutput.setTerminal(terminal);
-    return new TerminalRuntimeContext(dumb, terminal);
   }
 
   boolean isDumbTerminal() {
-    return this.dumbTerminal;
+    return this.mode == TerminalMode.DUMB;
+  }
+
+  boolean hasConsoleInput() {
+    return this.consoleInputAvailable;
   }
 
   void registerInterruptHandler(final Runnable handler) {
@@ -55,7 +74,7 @@ void registerInterruptHandler(final Runnable handler) {
   }
 
   @Nullable LineReader createLineReader(final SocketTransport socketClient, final Highlighter highlighter) {
-    if (this.dumbTerminal) {
+    if (this.mode == TerminalMode.DUMB) {
       return null;
     }
     return LineReaderBuilder.builder()

endermux-common/src/main/java/xyz/jpenilla/endermux/jline/TerminalMode.java

@@ -1,26 +1,3 @@
-/*
- * This file is part of Better Fabric Console, licensed under the MIT License.
- *
- * Copyright (c) 2021-2024 Jason Penilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package xyz.jpenilla.endermux.jline;
 
 import org.jspecify.annotations.NullMarked;

endermux-common/src/main/java/xyz/jpenilla/endermux/jline/TerminalModeDetection.java

@@ -1,26 +1,3 @@
-/*
- * This file is part of Better Fabric Console, licensed under the MIT License.
- *
- * Copyright (c) 2021-2024 Jason Penilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package xyz.jpenilla.endermux.jline;
 
 import java.io.IOException;