Improve dumb terminal detection

Author: jpenilla

src/main/java/xyz/jpenilla/betterfabricconsole/console/ConsoleThread.java

@@ -23,19 +23,19 @@
  */
 package xyz.jpenilla.betterfabricconsole.console;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
 import org.jline.reader.EndOfFileException;
 import org.jline.reader.LineReader;
 import org.jline.reader.UserInterruptException;
 import org.jspecify.annotations.NullMarked;
 import xyz.jpenilla.betterfabricconsole.BetterFabricConsole;
-import xyz.jpenilla.betterfabricconsole.util.TerminalDetection;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UncheckedIOException;
+import xyz.jpenilla.betterfabricconsole.util.TerminalModeDetection;
 
 @NullMarked
 public final class ConsoleThread extends Thread {
@@ -57,7 +57,7 @@ public ConsoleThread(
   @Override
   public void run() {
     BetterFabricConsole.LOGGER.info("Initialized Better Fabric Console console thread.");
-    if (TerminalDetection.isDumb()) {
+    if (TerminalModeDetection.isDumb()) {
       this.acceptInput(System.in);
     } else {
       this.acceptTerminalInput();

…abricconsole/util/TerminalDetection.java …tterfabricconsole/util/TerminalMode.javasrc/main/java/xyz/jpenilla/betterfabricconsole/util/TerminalDetection.java renamed to src/main/java/xyz/jpenilla/betterfabricconsole/util/TerminalMode.java src/main/java/xyz/jpenilla/betterfabricconsole/util/TerminalDetection.java renamed to src/main/java/xyz/jpenilla/betterfabricconsole/util/TerminalMode.java

@@ -23,23 +23,10 @@
  */
 package xyz.jpenilla.betterfabricconsole.util;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jline.terminal.Terminal;
-import org.jline.terminal.TerminalBuilder;
-import java.io.IOException;
+import org.jspecify.annotations.NullMarked;
 
-public final class TerminalDetection {
-  private static final @Nullable Terminal TERMINAL = detectTerminal();
-
-  private static @Nullable Terminal detectTerminal() {
-    try {
-      return TerminalBuilder.builder().dumb(false).build();
-    } catch (final IOException | IllegalStateException e) {
-      return null;
-    }
-  }
-
-  public static boolean isDumb() {
-    return TERMINAL == null;
-  }
+@NullMarked
+public enum TerminalMode {
+  DUMB,
+  INTERACTIVE
 }

src/main/java/xyz/jpenilla/betterfabricconsole/util/TerminalModeDetection.java

@@ -0,0 +1,66 @@
+/*
+ * 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.betterfabricconsole.util;
+
+import java.io.IOException;
+import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public final class TerminalModeDetection {
+  private static final boolean CONSOLE_INPUT_AVAILABLE = System.console() != null;
+  private static final TerminalMode MODE = detectMode();
+
+  private TerminalModeDetection() {
+  }
+
+  private static TerminalMode detectMode() {
+    if (!CONSOLE_INPUT_AVAILABLE) {
+      return TerminalMode.DUMB;
+    }
+
+    try (Terminal terminal = TerminalBuilder.builder().system(true).dumb(false).build()) {
+      return Terminal.TYPE_DUMB.equals(terminal.getType()) ? TerminalMode.DUMB : TerminalMode.INTERACTIVE;
+    } catch (final IOException | IllegalStateException e) {
+      return TerminalMode.DUMB;
+    }
+  }
+
+  public static TerminalMode mode() {
+    return MODE;
+  }
+
+  public static boolean isDumb() {
+    return MODE == TerminalMode.DUMB;
+  }
+
+  public static boolean isInteractive() {
+    return MODE == TerminalMode.INTERACTIVE;
+  }
+
+  public static boolean hasConsoleInput() {
+    return CONSOLE_INPUT_AVAILABLE;
+  }
+}