Add commands with usage and reload/status functionality

Author: renvins

velocity/src/main/java/it/renvins/serverpulse/velocity/ServerPulseVelocity.java

@@ -3,6 +3,7 @@
 import java.nio.file.Path;
 
 import com.google.inject.Inject;
+import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.plugin.Plugin;
@@ -21,6 +22,7 @@
 import it.renvins.serverpulse.common.metrics.DiskRetriever;
 import it.renvins.serverpulse.common.platform.Platform;
 import it.renvins.serverpulse.common.scheduler.TaskScheduler;
+import it.renvins.serverpulse.velocity.commands.ServerPulseCommand;
 import it.renvins.serverpulse.velocity.config.VelocityConfiguration;
 import it.renvins.serverpulse.velocity.config.VelocityDatabaseConfiguration;
 import it.renvins.serverpulse.velocity.config.VelocityMetricsConfiguration;
@@ -36,7 +38,6 @@
 public class ServerPulseVelocity {
 
     @Getter private final ProxyServer server;
-    private final Path dataDirectory;
     private final PulseLogger logger;
 
     private final VelocityConfiguration config;
@@ -50,7 +51,6 @@ public class ServerPulseVelocity {
     @Inject
     public ServerPulseVelocity(ProxyServer server, @DataDirectory Path dataDirectory, Logger logger) {
         this.server = server;
-        this.dataDirectory = dataDirectory;
 
         this.logger = new VelocityLogger(logger);
         this.config = new VelocityConfiguration(logger, dataDirectory, "config.yml");
@@ -79,12 +79,17 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
         this.databaseService = new DatabaseService(logger, platform, dbConfig, scheduler);
         this.metricsService = new MetricsService(logger, platform, metricsConfig, scheduler);
 
+        ServerPulseProvider.register(new ServerPulseVelocityAPI(databaseService, metricsService, diskRetriever, pingRetriever));
+
         databaseService.load();
         if (server.isShuttingDown()) {
             return;
         }
 
         metricsService.load();
-        ServerPulseProvider.register(new ServerPulseVelocityAPI(databaseService, metricsService, diskRetriever, pingRetriever));
+
+        CommandMeta meta = server.getCommandManager().metaBuilder("serverpulsevelocity")
+                .plugin(this).aliases("spv").build();
+        server.getCommandManager().register(meta, new ServerPulseCommand(config).createCommand());
     }
 }

velocity/src/main/java/it/renvins/serverpulse/velocity/commands/ServerPulseCommand.java

@@ -0,0 +1,74 @@
+package it.renvins.serverpulse.velocity.commands;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.velocitypowered.api.command.BrigadierCommand;
+import com.velocitypowered.api.command.CommandSource;
+import it.renvins.serverpulse.api.ServerPulseProvider;
+import it.renvins.serverpulse.common.utils.ChatUtils;
+import it.renvins.serverpulse.velocity.config.VelocityConfiguration;
+import lombok.RequiredArgsConstructor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+
+@RequiredArgsConstructor
+public class ServerPulseCommand {
+
+    private final VelocityConfiguration config;
+
+    public BrigadierCommand createCommand() {
+        // Create the main command
+        LiteralArgumentBuilder<CommandSource> command =
+                BrigadierCommand.literalArgumentBuilder("serverpulsevelocity")
+                                .executes(context -> {
+                                    CommandSource source = context.getSource();
+
+                                    Component message = LegacyComponentSerializer.legacySection().deserialize(
+                                            ChatUtils.format(config.getConfig().getString("messages.usage")));
+                                    source.sendMessage(message);
+
+                                    return Command.SINGLE_SUCCESS;
+                                });
+
+        command.then(BrigadierCommand.literalArgumentBuilder("reload")
+                                .requires(source -> source.hasPermission("serverpulse.reload"))
+                                .executes(this::executeReload)
+        );
+
+        command.then(BrigadierCommand.literalArgumentBuilder("status")
+                                .requires(source -> source.hasPermission("serverpulse.status"))
+                                .executes(this::executeStatus)
+        );
+
+        return new BrigadierCommand(command.build());
+    }
+
+    private int executeReload(CommandContext<CommandSource> context) {
+        CommandSource source = context.getSource();
+
+        Component message;
+        if (config.load()) {
+            message = LegacyComponentSerializer.legacySection().deserialize(
+                    ChatUtils.format(config.getConfig().getString("messages.reloadConfig")));
+        } else {
+            message = LegacyComponentSerializer.legacySection().deserialize(
+                    ChatUtils.format(config.getConfig().getString("messages.reloadConfigError")));
+        }
+
+        source.sendMessage(message);
+        return Command.SINGLE_SUCCESS;
+    }
+
+    private int executeStatus(CommandContext<CommandSource> context) {
+        CommandSource source = context.getSource();
+
+        Component message = LegacyComponentSerializer.legacySection().deserialize(
+                ChatUtils.format(ServerPulseProvider.get().getDatabaseService().isConnected() ?
+                        config.getConfig().getString("messages.statusConnected") :
+                        config.getConfig().getString("messages.statusNotConnected")));
+
+        source.sendMessage(message);
+        return Command.SINGLE_SUCCESS;
+    }
+}

velocity/src/main/java/it/renvins/serverpulse/velocity/config/VelocityConfiguration.java

@@ -29,7 +29,7 @@ public VelocityConfiguration(Logger logger, Path dataDir, String name) {
         this.config = new YamlFile(new File(dataDir.toFile(), name));
     }
 
-    public void load() {
+    public boolean load() {
         try {
             if (!config.exists()) {
                 if (copyDefaultsFromResource()) {
@@ -42,8 +42,10 @@ public void load() {
                 logger.info("Loading configuration file: " + name);
             }
             config.load();
+            return true;
         } catch (Exception e) {
             logger.error("Failed to load configuration file: " + name, e);
+            return false;
         }
     }
 

velocity/src/main/resources/config.yml

@@ -10,13 +10,8 @@ metrics:
   tags:
     server: "velocity1"
 messages:
-  noPerms: "&7[&bServer&7Pulse] &7You don't have &bpermission &7to use this &bcommand&7."
+  usage: "&7[&bServer&7Pulse] &7Please use &b/serverpulsevelocity [status|reload]&7."
   reloadConfig: "&7[&bServer&7Pulse] &7Configuration &breloaded&7."
   reloadConfigError: "&7[&bServer&7Pulse] &7Error &breloading &7configuration..."
-  noArgs: "&7[&bServer&7Pulse] &7You need to specify a &bcommand&7: &breload&7, &bstatus&7."
-  playerOnly: "&7[&bServer&7Pulse] &7This command can only be used by &bplayers&7."
-  noCommand: "&7[&bServer&7Pulse] &7This command is not &bavailable&7."
-  reloadConfigUsage: "&7[&bServer&7Pulse] &7Usage: &b/serverpulse reload&7."
-  statusConfigUsage: "&7[&bServer&7Pulse] &7Usage: &b/serverpulse status&7."
   statusConnected: "&7[&bServer&7Pulse] &7Connected to &bInfluxDB&7."
   statusNotConnected: "&7[&bServer&7Pulse] &7Not connected to &bInfluxDB&7."