Redesign the HTTPD

Author: Telesphoreo

src/main/java/dev/plex/HTTPDModule.java

@@ -88,6 +88,11 @@ public void enable()
             new CommandsEndpoint();
             new SchematicDownloadEndpoint();
             new SchematicUploadEndpoint();
+            new StatsEndpoint();
+            new PlayersEndpoint();
+            new AssetsEndpoint();
+            new PunishmentsUIEndpoint();
+            new IndefBansUIEndpoint();
 
             ServletHolder uploadHolder = HTTPDModule.context.addServlet(SchematicUploadServlet.class, "/api/schematics/uploading");
 

src/main/java/dev/plex/request/AbstractServlet.java

@@ -13,6 +13,7 @@
 import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 import java.util.List;
@@ -39,7 +40,9 @@ public AbstractServlet()
                 }
                 GET_MAPPINGS.add(mapping);
                 ServletHolder holder = new ServletHolder(this);
-                HTTPDModule.context.addServlet(holder, getMapping.endpoint() + "*");
+                String endpoint = getMapping.endpoint();
+                String pattern = endpoint.endsWith("/") ? endpoint + "*" : endpoint;
+                HTTPDModule.context.addServlet(holder, pattern);
             }
         }
     }
@@ -63,15 +66,22 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
         }*/
         GET_MAPPINGS.stream().filter(mapping -> endpointMatchesRequest(mapping.getMapping().endpoint(), requestPath)).forEach(mapping ->
         {
+            resp.setCharacterEncoding("UTF-8");
             if (mapping.headers != null)
             {
                 for (String headers : mapping.headers.headers())
                 {
-                    String header = headers.split(";")[0];
-                    String value = headers.split(";")[1];
-                    resp.addHeader(header, value);
+                    String[] parts = headers.split(";", 2);
+                    if (parts.length == 2)
+                    {
+                        resp.addHeader(parts[0], parts[1]);
+                    }
                 }
             }
+            if (resp.getContentType() == null)
+            {
+                resp.setContentType("text/html; charset=UTF-8");
+            }
             resp.setStatus(HttpServletResponse.SC_OK);
             try
             {
@@ -129,11 +139,10 @@ public static String readFile(InputStream filename)
         String page = readFileReal(filename);
         String[] info = page.split("\n", 3);
         base = base.replace("${TITLE}", info[0]);
-        base = base.replace("${ACTIVE_" + info[1] + "}", "active\" aria-current=\"page");
+        base = base.replace("${ACTIVE_" + info[1] + "}", "active");
         base = base.replace("${ACTIVE_HOME}", "");
-        base = base.replace("${ACTIVE_ADMINS}", "");
+        base = base.replace("${ACTIVE_PLAYERS}", "");
         base = base.replace("${ACTIVE_INDEFBANS}", "");
-        base = base.replace("${ACTIVE_LIST}", "");
         base = base.replace("${ACTIVE_COMMANDS}", "");
         base = base.replace("${ACTIVE_PUNISHMENTS}", "");
         base = base.replace("${ACTIVE_SCHEMATICS}", "");
@@ -146,7 +155,7 @@ public static String readFileReal(InputStream filename)
         StringBuilder contentBuilder = new StringBuilder();
         try
         {
-            BufferedReader in = new BufferedReader(new InputStreamReader(Objects.requireNonNull(filename)));
+            BufferedReader in = new BufferedReader(new InputStreamReader(Objects.requireNonNull(filename), StandardCharsets.UTF_8));
             String str;
             while ((str = in.readLine()) != null)
             {

src/main/java/dev/plex/request/impl/AssetsEndpoint.java

@@ -0,0 +1,46 @@
+package dev.plex.request.impl;
+
+import dev.plex.request.AbstractServlet;
+import dev.plex.request.GetMapping;
+import dev.plex.request.MappingHeaders;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class AssetsEndpoint extends AbstractServlet
+{
+    @GetMapping(endpoint = "/assets/dashboard.js")
+    @MappingHeaders(headers = {"content-type;application/javascript; charset=utf-8", "cache-control;public, max-age=300"})
+    public String dashboardJs(HttpServletRequest request, HttpServletResponse response)
+    {
+        return readFileReal(this.getClass().getResourceAsStream("/httpd/assets/dashboard.js"));
+    }
+
+    @GetMapping(endpoint = "/assets/plexlogo.webp")
+    @MappingHeaders(headers = {"content-type;image/webp", "cache-control;public, max-age=86400"})
+    public String plexLogo(HttpServletRequest request, HttpServletResponse response)
+    {
+        serveResource("/httpd/assets/plexlogo.webp", response);
+        return null;
+    }
+
+    private static void serveResource(String classpathPath, HttpServletResponse response)
+    {
+        try (InputStream in = AssetsEndpoint.class.getResourceAsStream(classpathPath);
+             OutputStream out = response.getOutputStream())
+        {
+            if (in == null)
+            {
+                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                return;
+            }
+            in.transferTo(out);
+        }
+        catch (IOException ignored)
+        {
+        }
+    }
+}

src/main/java/dev/plex/request/impl/CommandsEndpoint.java

@@ -6,106 +6,151 @@
 import dev.plex.request.GetMapping;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
+
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.PluginIdentifiableCommand;
 
 public class CommandsEndpoint extends AbstractServlet
 {
-
-    private final StringBuilder list = new StringBuilder();
-    private boolean loadedCommands = false;
+    private String cachedHtml;
 
     @GetMapping(endpoint = "/api/commands/")
     public String getCommands(HttpServletRequest request, HttpServletResponse response)
     {
-        if (!loadedCommands)
+        if (cachedHtml == null)
         {
-            final SortedMap<String, List<Command>> commandMap = new TreeMap<>();
-            final CommandMap map = Bukkit.getCommandMap();
-            for (Command command : map.getKnownCommands().values())
+            cachedHtml = buildSections();
+        }
+        String file = readFile(this.getClass().getResourceAsStream("/httpd/commands.html"));
+        file = file.replace("${commands}", cachedHtml);
+        return file;
+    }
+
+    private static String buildSections()
+    {
+        final SortedMap<String, List<Command>> commandMap = new TreeMap<>();
+        final CommandMap map = Bukkit.getCommandMap();
+        for (Command command : map.getKnownCommands().values())
+        {
+            String plugin = "Bukkit";
+            if (command instanceof PluginIdentifiableCommand pic)
             {
-                String plugin = "Bukkit";
-                if (command instanceof PluginIdentifiableCommand)
-                {
-                    plugin = ((PluginIdentifiableCommand) command).getPlugin().getName();
-                }
-
-                List<Command> pluginCommands = commandMap.computeIfAbsent(plugin, k -> new ArrayList<>());
-                if (!pluginCommands.contains(command))
-                {
-                    pluginCommands.add(command);
-                }
+                plugin = pic.getPlugin().getName();
             }
-
-            for (String key : commandMap.keySet())
+            List<Command> pluginCommands = commandMap.computeIfAbsent(plugin, k -> new ArrayList<>());
+            if (!pluginCommands.contains(command))
             {
-                commandMap.get(key).sort(Comparator.comparing(Command::getName));
-                StringBuilder rows = new StringBuilder();
-                for (Command command : commandMap.get(key))
-                {
-                    String permission = command.getPermission();
-                    if (command instanceof PlexCommand plexCmd)
-                    {
-                        CommandPermissions perms = plexCmd.getClass().getAnnotation(CommandPermissions.class);
-                        if (perms != null)
-                        {
-                            permission = (perms.permission().isBlank() ? "N/A" : perms.permission());
-                        }
-                    }
-
-                    rows.append(createRow(command.getName(), command.getAliases(), command.getDescription(), command.getUsage(), permission));
-                }
-
-                list.append(createTable(key, rows.toString())).append("\n");
+                pluginCommands.add(command);
             }
+        }
 
-            loadedCommands = true;
+        StringBuilder sb = new StringBuilder();
+        for (String key : commandMap.keySet())
+        {
+            List<Command> commands = commandMap.get(key);
+            commands.sort(Comparator.comparing(Command::getName));
+            sb.append(renderSection(key, commands));
         }
+        return sb.toString();
+    }
 
-        return commandsHTML(list.toString());
+    private static String renderSection(String plugin, List<Command> commands)
+    {
+        StringBuilder cards = new StringBuilder();
+        for (Command c : commands)
+        {
+            cards.append(renderCard(c));
+        }
+        String name = escapeHtml(plugin);
+        return """
+            <details class="command-section group mt-3 first:mt-0" data-plugin="%s" open>
+                <summary class="group flex cursor-pointer list-none items-center justify-between gap-3 rounded-2xl px-2 py-3 transition-colors hover:bg-muted/40 [&::-webkit-details-marker]:hidden">
+                    <span class="flex items-center gap-2.5 text-lg font-medium tracking-tight">
+                        <svg class="size-4 text-muted-foreground transition-transform group-open:rotate-90" aria-hidden="true"><use href="#i-arrow-right"/></svg>
+                        %s
+                    </span>
+                    <span class="font-mono text-[11px] uppercase tracking-wider text-muted-foreground">
+                        %d %s
+                    </span>
+                </summary>
+                <div class="mt-3 grid gap-3 md:grid-cols-2 xl:grid-cols-3">
+                    %s
+                </div>
+            </details>
+            """.formatted(name, name, commands.size(), commands.size() == 1 ? "command" : "commands", cards);
     }
 
-    private String commandsHTML(String commandsList)
+    private static String renderCard(Command c)
     {
-        String file = readFile(this.getClass().getResourceAsStream("/httpd/commands.html"));
-        file = file.replace("${commands}", commandsList);
-        return file;
+        String name = escapeHtml(c.getName());
+        String aliases = c.getAliases() == null || c.getAliases().isEmpty() ? "" : String.join(", ", c.getAliases());
+        String description = c.getDescription() == null || c.getDescription().isBlank() ? "" : escapeHtml(c.getDescription());
+        String usage = cleanUsage(c.getUsage());
+        String permission = resolvePermission(c);
+
+        String aliasMarkup = aliases.isEmpty()
+            ? ""
+            : "<span class=\"font-mono text-xs text-muted-foreground\">/ " + escapeHtml(aliases) + "</span>";
+
+        String descMarkup = description.isEmpty()
+            ? "<p class=\"mt-2 text-sm text-muted-foreground/70 italic\">No description provided.</p>"
+            : "<p class=\"mt-2 text-sm text-muted-foreground\">" + description + "</p>";
+
+        String searchBlob = (name + " " + aliases + " " + description + " " + permission).toLowerCase();
+
+        return """
+            <article class="ring-card group flex flex-col rounded-2xl bg-card p-4 transition-colors hover:bg-secondary/50" data-search="%s">
+                <header class="flex flex-wrap items-baseline gap-2">
+                    <code class="rounded-md bg-muted px-2 py-0.5 font-mono text-sm font-medium text-foreground">/%s</code>
+                    %s
+                </header>
+                %s
+                <dl class="mt-3 grid grid-cols-[max-content_1fr] gap-x-3 gap-y-1.5 border-t border-border/60 pt-3 font-mono text-[11px]">
+                    <dt class="text-muted-foreground uppercase tracking-wider">usage</dt>
+                    <dd class="text-foreground/80 break-all">%s</dd>
+                    <dt class="text-muted-foreground uppercase tracking-wider">perm</dt>
+                    <dd class="text-foreground/80 break-all">%s</dd>
+                </dl>
+            </article>
+            """.formatted(searchBlob, name, aliasMarkup, descMarkup, usage, permission);
     }
 
-    private String createTable(String pluginName, String commandRows)
+    private static String resolvePermission(Command c)
     {
-        return "<details id=\"" + pluginName + "\"><summary>" + pluginName + "</summary>\n"
-            + "<table id=\"" + pluginName + "Table\" class=\"table table-striped table-bordered\">\n"
-            + "  <thead>\n  <tr>\n    <th scope=\"col\">Name (Aliases)</th>\n    "
-            + "<th scope=\"col\">Description</th>\n    "
-            + "<th scope=\"col\">Usage</th>\n    "
-            + "<th scope=\"col\">Permission</th>\n  </tr>\n</thead>\n"
-            + "<tbody>\n  " + commandRows + "\n</tbody>\n</table>\n</details>";
+        String permission = c.getPermission();
+        if (c instanceof PlexCommand plexCmd)
+        {
+            CommandPermissions perms = plexCmd.getClass().getAnnotation(CommandPermissions.class);
+            if (perms != null)
+            {
+                permission = perms.permission().isBlank() ? "N/A" : perms.permission();
+            }
+        }
+        if (permission == null || permission.isBlank()) return "N/A";
+        return escapeHtml(permission).replace(";", "<br>");
     }
 
-    private String createRow(String name, List<String> aliases, String description, String usage, String permission)
+    private static String cleanUsage(String usage)
     {
-        return "  <tr>\n    <th scope=\"row\">" + name
-            + (aliases.isEmpty() || aliases.toString().equals("[]") ? "" : " (" + String.join(", ", aliases) + ")") + "</th>\n"
-            + "    <th scope=\"row\">" + description + "</th>\n"
-            + "    <th scope=\"row\"><code>" + cleanUsage(usage) + "</code></th>\n"
-            + "    <th scope=\"row\">" + (permission != null ? permission.replaceAll(";", "<br>") : "N/A") + "</th>\n  </tr>";
+        if (usage == null || usage.isBlank()) return "Not provided";
+        String escaped = escapeHtml(usage);
+        return escaped.startsWith("/") ? escaped : "/" + escaped;
     }
 
-    private String cleanUsage(String usage)
+    private static String escapeHtml(String s)
     {
-        usage = usage.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
-        if (usage.isBlank())
-        {
-            usage = "Not Provided";
-        }
-        return usage.startsWith("/") || usage.equals("Not Provided") ? usage : "/" + usage;
+        if (s == null) return "";
+        return s.replace("&", "&amp;")
+                .replace("<", "&lt;")
+                .replace(">", "&gt;")
+                .replace("\"", "&quot;");
     }
 }