Started work on new command viewer webpage

RealMangorage · RealMangorage · commit 708c1a3db594 · 2026-01-24T15:50:34.000-08:00
diff --git a/build.gradle b/build.gradle
@@ -92,7 +92,7 @@ dependencies {
 
     launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
 
-    plugin('org.mangorage:mangobot:12.0.109')
+    plugin('org.mangorage:mangobot:12.0.113')
     plugin('org.mangorage:mangobotplugin:12.0.63')
 
     library('org.eclipse.jetty:jetty-server:11.0.16')
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -28,7 +28,7 @@
     exports org.mangorage.mangobotsite.website.servlet to org.eclipse.jetty.server;
 
     exports org.mangorage.mangobotsite.website to freemarker;
-    exports org.mangorage.mangobotsite.website.impl to freemarker;
+    exports org.mangorage.mangobotsite.website.servlet.impl to freemarker;
     exports org.mangorage.mangobotsite.website.util to freemarker;
 
 
diff --git a/src/main/java/org/mangorage/mangobotsite/MangoBotSite.java b/src/main/java/org/mangorage/mangobotsite/MangoBotSite.java
@@ -7,7 +7,7 @@
 import org.mangorage.mangobotplugin.entrypoint.MangoBot;
 import org.mangorage.mangobotsite.website.WebServer;
 import org.mangorage.mangobotsite.website.file.FileUploadManager;
-import org.mangorage.mangobotsite.website.impl.ObjectMap;
+import org.mangorage.mangobotsite.website.util.ObjectMap;
 import org.mangorage.mangobotsite.website.util.WebConstants;
 
 import java.nio.file.Path;
diff --git a/src/main/java/org/mangorage/mangobotsite/website/WebServer.java b/src/main/java/org/mangorage/mangobotsite/website/WebServer.java
@@ -3,7 +3,6 @@
 
 
 import jakarta.servlet.DispatcherType;
-import jakarta.servlet.MultipartConfigElement;
 import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -15,17 +14,16 @@
 import org.jetbrains.annotations.NotNull;
 import org.mangorage.mangobotcore.api.util.log.LogHelper;
 import org.mangorage.mangobotsite.Helper;
-import org.mangorage.mangobotsite.website.file.FileUploadManager;
 import org.mangorage.mangobotsite.website.filters.RequestInterceptorFilter;
 import org.mangorage.mangobotsite.website.handlers.DefaultErrorHandler;
-import org.mangorage.mangobotsite.website.impl.ObjectMap;
+import org.mangorage.mangobotsite.website.servlet.CommandsServlet;
+import org.mangorage.mangobotsite.website.util.ObjectMap;
 import org.mangorage.mangobotsite.website.servlet.HomeServlet;
 import org.mangorage.mangobotsite.website.servlet.TricksServlet;
 import org.mangorage.mangobotsite.website.util.ResolveString;
 import org.mangorage.mangobotsite.website.util.ServletContextHandlerBuilder;
 import org.mangorage.mangobotsite.website.util.WebConstants;
 
-import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.Set;
 
@@ -104,6 +102,7 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
 
                 .addHttpServlet(HomeServlet.class, "/home")
                 .addServlet(TricksServlet.class, "/tricks")
+                .addServlet(CommandsServlet.class, "/commands")
 
                 .setAttribute(WebConstants.WEB_OBJECT_ID, objectMap)
                 .addFilter(RequestInterceptorFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST))
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/CommandsServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/CommandsServlet.java
@@ -0,0 +1,34 @@
+package org.mangorage.mangobotsite.website.servlet;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.mangorage.mangobotcore.api.command.v1.AbstractCommand;
+import org.mangorage.mangobotcore.api.plugin.v1.PluginManager;
+import org.mangorage.mangobotplugin.entrypoint.MangoBot;
+import org.mangorage.mangobotsite.website.servlet.impl.StandardHttpServlet;
+import org.mangorage.mangobotsite.website.util.MapBuilder;
+import org.mangorage.mangobotsite.website.util.WebUtil;
+import java.io.IOException;
+
+public final class CommandsServlet extends StandardHttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        final var plugin = PluginManager.getInstance().getPlugin("mangobot").getInstance(MangoBot.class);
+        final var dispatcher = plugin.getCommandDispatcher();
+        final var command = dispatcher.getCommand("trick").buildCommandParts();
+
+        WebUtil.processTemplate(
+                MapBuilder.of()
+                        .put("commandDataList",
+                                dispatcher.getAllRegisteredCommands()
+                                        .stream()
+                                        .map(AbstractCommand::buildCommandParts)
+                                        .toList()
+                        )
+                        .get(),
+                "commands.ftl",
+                resp.getWriter()
+        );
+    }
+}
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/HomeServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/HomeServlet.java
@@ -6,16 +6,13 @@
 import org.mangorage.mangobotcore.api.plugin.v1.PluginContainer;
 import org.mangorage.mangobotcore.api.plugin.v1.PluginManager;
 import org.mangorage.mangobotplugin.entrypoint.MangoBot;
-import org.mangorage.mangobotsite.website.Header;
 import org.mangorage.mangobotsite.website.WebsiteConstants;
-import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
-import org.mangorage.mangobotsite.website.servlet.data.HeaderData;
+import org.mangorage.mangobotsite.website.servlet.impl.StandardHttpServlet;
 import org.mangorage.mangobotsite.website.servlet.data.PluginData;
 import org.mangorage.mangobotsite.website.util.MapBuilder;
 import org.mangorage.mangobotsite.website.util.WebUtil;
 
 import java.io.IOException;
-import java.util.List;
 
 public class HomeServlet extends StandardHttpServlet {
 
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/TricksServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/TricksServlet.java
@@ -6,17 +6,15 @@
 import org.mangorage.mangobotcore.api.plugin.v1.PluginManager;
 import org.mangorage.mangobotplugin.entrypoint.MangoBot;
 import org.mangorage.mangobotsite.website.WebsiteConstants;
-import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
+import org.mangorage.mangobotsite.website.servlet.impl.StandardHttpServlet;
 import org.mangorage.mangobotsite.website.servlet.data.GuildsData;
 import org.mangorage.mangobotsite.website.servlet.data.category.CategoryData;
-import org.mangorage.mangobotsite.website.servlet.data.category.CategoryItemData;
 import org.mangorage.mangobotsite.website.servlet.data.trick.TrickData;
 import org.mangorage.mangobotsite.website.servlet.data.trick.TrickInfoData;
 import org.mangorage.mangobotsite.website.util.MapBuilder;
 import org.mangorage.mangobotsite.website.util.WebUtil;
 
 import java.io.IOException;
-import java.util.List;
 
 public final class TricksServlet extends StandardHttpServlet {
 
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/impl/StandardHttpServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/impl/StandardHttpServlet.java
@@ -1,11 +1,12 @@
-package org.mangorage.mangobotsite.website.impl;
+package org.mangorage.mangobotsite.website.servlet.impl;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.mangorage.mangobotsite.website.util.ObjectMap;
 import org.mangorage.mangobotsite.website.util.WebConstants;
 
 import java.io.IOException;
diff --git a/src/main/java/org/mangorage/mangobotsite/website/util/ObjectMap.java b/src/main/java/org/mangorage/mangobotsite/website/util/ObjectMap.java
@@ -1,4 +1,4 @@
-package org.mangorage.mangobotsite.website.impl;
+package org.mangorage.mangobotsite.website.util;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/org/mangorage/mangobotsite/website/util/ServletContextHandlerBuilder.java b/src/main/java/org/mangorage/mangobotsite/website/util/ServletContextHandlerBuilder.java
@@ -6,7 +6,7 @@
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
+import org.mangorage.mangobotsite.website.servlet.impl.StandardHttpServlet;
 
 import java.util.EnumSet;
 import java.util.function.Consumer;
diff --git a/src/main/resources/templates/commands.ftl b/src/main/resources/templates/commands.ftl
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Commands</title>
+        <style>
+            body {
+            font-family: monospace;
+            background: #0f0f0f;
+            color: #eee;
+            padding: 20px;
+            }
+
+            .command-block {
+            margin-bottom: 24px;
+            border-bottom: 1px solid #333;
+            padding-bottom: 12px;
+            }
+
+            .command {
+            margin: 4px 0;
+            }
+
+            .param {
+            color: #7fd7ff;
+            cursor: help;
+            position: relative;
+            }
+
+            .param.required {
+            color: #ff7f7f;
+            }
+
+            .tooltip {
+            display: none;
+            position: absolute;
+            background: #222;
+            border: 1px solid #555;
+            padding: 6px;
+            border-radius: 4px;
+            top: 1.5em;
+            left: 0;
+            white-space: nowrap;
+            z-index: 100;
+            }
+
+            .param:hover .tooltip {
+            display: block;
+            }
+        </style>
+    </head>
+    <body>
+
+        <h1>Command List</h1>
+
+        <#list commandDataList as data>
+            <div class="command-block">
+
+                <!-- Show CommandData.cmd -->
+                <h2>${data.cmd()}</h2>
+
+                <#list data.commandParts() as cmd>
+                    <div class="command">
+                        <span>${cmd.getName()}</span>
+
+                        <#list cmd.getParameters() as p>
+                            <span class="param <#if p.isRequired()>required</#if>">
+                                <#if p.isRequired()>
+                                    &lt;${p.getName()}&gt;
+                                <#else>
+                                    [${p.getName()}]
+                                </#if>
+
+                                <span class="tooltip">
+                                    <div><b>Name:</b> ${p.getName()}</div>
+                                    <div><b>Type:</b> ${p.getType()}</div>
+                                    <div><b>Argument Type:</b> ${p.getArgumentType()}</div>
+                                    <div><b>Description:</b> ${p.getDescription()}</div>
+                                    <div><b>Suggestions:</b> ${p.getSuggestions()}</div>
+                                    <div><b>Required:</b> ${p.isRequired()?string("yes","no")}</div>
+                                </span>
+                            </span>
+                        </#list>
+                    </div>
+                </#list>
+
+            </div>
+        </#list>
+
+    </body>
+</html>
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.mangorage.mangobotsite.website.impl;`
	`1`	`+package org.mangorage.mangobotsite.website.util;`
`2`	`2`
`3`	`3`	`import java.util.HashMap;`
`4`	`4`