From 3c2300bc60a76487239eec522db89f7a3efa7442 Mon Sep 17 00:00:00 2001 From: HttpRafa <60099368+HttpRafa@users.noreply.github.com> Date: Wed, 8 Jan 2025 19:59:23 +0100 Subject: [PATCH 1/5] feat: Implement UnitArgument.java --- clients/jvm/build.gradle.kts | 2 +- .../cloud/common/cache/CachedObject.java | 26 +++++++++ .../common/connection/CloudConnection.java | 52 ++++++++++++------ clients/jvm/gradle.properties | 10 ++-- clients/jvm/gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- clients/jvm/gradlew | 4 +- clients/jvm/gradlew.bat | 2 + clients/jvm/paper/build.gradle.kts | 4 +- .../cloud/paper/command/UnitCommand.java | 23 ++++++++ .../paper/command/argument/UnitArgument.java | 47 ++++++++++++++++ .../cloud/paper/permission/Permissions.java | 3 +- protocol/grpc/unit/unit.proto | 15 +++++ 13 files changed, 163 insertions(+), 27 deletions(-) create mode 100644 clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java mode change 100644 => 100755 clients/jvm/gradlew create mode 100644 clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java create mode 100644 clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java diff --git a/clients/jvm/build.gradle.kts b/clients/jvm/build.gradle.kts index 8cd1ad03..95d57a62 100644 --- a/clients/jvm/build.gradle.kts +++ b/clients/jvm/build.gradle.kts @@ -2,7 +2,7 @@ import com.google.protobuf.gradle.id plugins { id("java") - id("com.diffplug.spotless") version "7.0.0.BETA1" + id("com.diffplug.spotless") version "7.0.1" id("com.google.protobuf") version "0.9.4" } diff --git a/clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java b/clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java new file mode 100644 index 00000000..ba6cd3cb --- /dev/null +++ b/clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java @@ -0,0 +1,26 @@ +package io.atomic.cloud.common.cache; + +import java.util.Optional; + +public class CachedObject { + + public static final long DEFAULT_EXPIRATION = 1000 * 30; + + private T value; + private long invalidateTime; + + public synchronized Optional getValue() { + if(this.value == null) return Optional.empty(); + if(System.currentTimeMillis() > invalidateTime) { + this.value = null; + return Optional.empty(); + } + return Optional.of(this.value); + } + + public synchronized void setValue(T value) { + this.value = value; + this.invalidateTime = System.currentTimeMillis() + DEFAULT_EXPIRATION; + } + +} diff --git a/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java b/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java index 4a4574f2..1140a3ad 100644 --- a/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java +++ b/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java @@ -4,10 +4,8 @@ import com.google.protobuf.Empty; import com.google.protobuf.StringValue; import com.google.protobuf.UInt32Value; -import io.atomic.cloud.grpc.unit.ChannelManagement; -import io.atomic.cloud.grpc.unit.TransferManagement; -import io.atomic.cloud.grpc.unit.UnitServiceGrpc; -import io.atomic.cloud.grpc.unit.UserManagement; +import io.atomic.cloud.common.cache.CachedObject; +import io.atomic.cloud.grpc.unit.*; import io.grpc.CallCredentials; import io.grpc.ManagedChannelBuilder; import io.grpc.Metadata; @@ -16,6 +14,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.util.List; +import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import lombok.Getter; @@ -32,8 +32,9 @@ public class CloudConnection { private UnitServiceGrpc.UnitServiceStub client; // Cache values - private UInt32Value protocolVersion; - private StringValue controllerVersion; + private final CachedObject protocolVersion = new CachedObject<>(); + private final CachedObject controllerVersion = new CachedObject<>(); + private final CachedObject unitsInfo = new CachedObject<>(); public void connect() { var channel = ManagedChannelBuilder.forAddress(this.address.getHost(), this.address.getPort()); @@ -127,6 +128,27 @@ public void subscribeToChannel(String channel, StreamObserver getUnitsNow() { + var cached = this.unitsInfo.getValue(); + if(cached.isEmpty()) { + this.getUnits(); // Request value from controller + } + return cached; + } + + public CompletableFuture getUnits() { + var cached = this.unitsInfo.getValue(); + if (cached.isPresent()) { + return CompletableFuture.completedFuture(cached.get()); + } + var observer = new StreamObserverImpl(); + this.client.getUnits(Empty.getDefaultInstance(), observer); + return observer.future().thenApply((value) -> { + this.unitsInfo.setValue(value); + return value; + }); + } + public CompletableFuture sendReset() { var observer = new StreamObserverImpl(); this.client.reset(Empty.getDefaultInstance(), observer); @@ -134,29 +156,27 @@ public CompletableFuture sendReset() { } public synchronized CompletableFuture getProtocolVersion() { - if (this.controllerVersion != null) { - return CompletableFuture.completedFuture(this.protocolVersion); + var cached = this.protocolVersion.getValue(); + if (cached.isPresent()) { + return CompletableFuture.completedFuture(cached.get()); } var observer = new StreamObserverImpl(); this.client.getProtocolVersion(Empty.getDefaultInstance(), observer); return observer.future().thenApply((value) -> { - synchronized (this) { - this.protocolVersion = value; - } + this.protocolVersion.setValue(value); return value; }); } public synchronized CompletableFuture getControllerVersion() { - if (this.controllerVersion != null) { - return CompletableFuture.completedFuture(this.controllerVersion); + var cached = this.controllerVersion.getValue(); + if (cached.isPresent()) { + return CompletableFuture.completedFuture(cached.get()); } var observer = new StreamObserverImpl(); this.client.getControllerVersion(Empty.getDefaultInstance(), observer); return observer.future().thenApply((value) -> { - synchronized (this) { - this.controllerVersion = value; - } + this.controllerVersion.setValue(value); return value; }); } diff --git a/clients/jvm/gradle.properties b/clients/jvm/gradle.properties index 16f4cc0d..45d3919a 100644 --- a/clients/jvm/gradle.properties +++ b/clients/jvm/gradle.properties @@ -9,12 +9,12 @@ archive_basename=client client_version=0.3.0 ## Minecraft -minecraft_version=1.21.1 +minecraft_version=1.21.4 ## Java -lombok_version=1.18.34 -jetbrains_annotations_version=24.0.0 +lombok_version=1.18.36 +jetbrains_annotations_version=26.0.1 ## gRPC -grpc_version=1.65.0 -protobuf_version=4.27.2 \ No newline at end of file +grpc_version=1.69.0 +protobuf_version=4.29.2 \ No newline at end of file diff --git a/clients/jvm/gradle/wrapper/gradle-wrapper.jar b/clients/jvm/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ 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 diff --git a/clients/jvm/gradle/wrapper/gradle-wrapper.properties b/clients/jvm/gradle/wrapper/gradle-wrapper.properties index a4413138..cea7a793 100644 --- a/clients/jvm/gradle/wrapper/gradle-wrapper.properties +++ b/clients/jvm/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/clients/jvm/gradlew b/clients/jvm/gradlew old mode 100644 new mode 100755 index b740cf13..f3b75f3b --- a/clients/jvm/gradlew +++ b/clients/jvm/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/clients/jvm/gradlew.bat b/clients/jvm/gradlew.bat index 25da30db..9d21a218 100644 --- a/clients/jvm/gradlew.bat +++ b/clients/jvm/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/clients/jvm/paper/build.gradle.kts b/clients/jvm/paper/build.gradle.kts index fa0425dd..d4fd3ece 100644 --- a/clients/jvm/paper/build.gradle.kts +++ b/clients/jvm/paper/build.gradle.kts @@ -9,10 +9,10 @@ plugins { // Paper - id("io.papermc.paperweight.userdev") version "1.7.1" + id("io.papermc.paperweight.userdev") version "2.0.0-beta.12" // Shadow (Only for including the API files into the jar) - id("com.gradleup.shadow") version "8.3.0" + id("com.gradleup.shadow") version "9.0.0-beta4" } dependencies { diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java new file mode 100644 index 00000000..28a23062 --- /dev/null +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java @@ -0,0 +1,23 @@ +package io.atomic.cloud.paper.command; + +import com.mojang.brigadier.Command; +import io.atomic.cloud.paper.command.argument.UnitArgument; +import io.atomic.cloud.paper.permission.Permissions; +import io.papermc.paper.command.brigadier.Commands; +import io.papermc.paper.command.brigadier.argument.ArgumentTypes; +import org.jetbrains.annotations.NotNull; + +public class UnitCommand { + + public static void register(@NotNull Commands commands) { + commands.register(Commands.literal("server") + .requires(Permissions.SERVER_COMMAND::check) + .then(Commands.argument("user", ArgumentTypes.players()).then(Commands.argument("unit", UnitArgument.INSTANCE).executes(context -> { + + // TODO: Command itself + + return Command.SINGLE_SUCCESS; + }))) + .build()); + } +} diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java new file mode 100644 index 00000000..bf5c79ad --- /dev/null +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java @@ -0,0 +1,47 @@ +package io.atomic.cloud.paper.command.argument; + +import com.mojang.brigadier.StringReader; +import com.mojang.brigadier.arguments.ArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import io.atomic.cloud.grpc.unit.UnitInformation; +import io.atomic.cloud.paper.CloudPlugin; +import net.minecraft.commands.SharedSuggestionProvider; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.NotNull; + +import java.util.Arrays; +import java.util.Collection; +import java.util.concurrent.CompletableFuture; + +public class UnitArgument implements ArgumentType { + + public static final UnitArgument INSTANCE = new UnitArgument(); + + private static final Collection EXAMPLES = Arrays.asList("lobby-1", "bedwars-2x1-1"); + public static final DynamicCommandExceptionType ERROR_STILL_FETCHING = new DynamicCommandExceptionType((_ignored) -> Component.literal("Fetching units...")); + public static final DynamicCommandExceptionType ERROR_NOT_FOUND = new DynamicCommandExceptionType((unit) -> Component.literal("\"" + unit + "\" does not exist")); + + @Override + public UnitInformation.SimpleUnitValue parse(@NotNull StringReader reader) throws CommandSyntaxException { + var unquotedString = reader.readUnquotedString(); + var cached = CloudPlugin.INSTANCE.connection().getUnitsNow(); + if(cached.isEmpty()) throw ERROR_STILL_FETCHING.createWithContext(reader, unquotedString); + var unit = cached.get().getUnitsList().stream().filter(item -> item.getName().equals(unquotedString)).findFirst(); + if(unit.isEmpty()) throw ERROR_NOT_FOUND.createWithContext(reader, unquotedString); + return unit.get(); + } + + @Override + public CompletableFuture listSuggestions(CommandContext context, SuggestionsBuilder builder) { + return CloudPlugin.INSTANCE.connection().getUnits().thenCompose(response -> SharedSuggestionProvider.suggest(response.getUnitsList().stream().map(UnitInformation.SimpleUnitValue::getName), builder)); + } + + @Override + public Collection getExamples() { + return EXAMPLES; + } +} diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/permission/Permissions.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/permission/Permissions.java index 13e48115..e35e56af 100644 --- a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/permission/Permissions.java +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/permission/Permissions.java @@ -9,7 +9,8 @@ @AllArgsConstructor @Getter public enum Permissions { - CLOUD_COMMAND("atomic.cloud.command.cloud"); + CLOUD_COMMAND("atomic.cloud.command.cloud"), + SERVER_COMMAND("atomic.cloud.command.server"); private final String permission; diff --git a/protocol/grpc/unit/unit.proto b/protocol/grpc/unit/unit.proto index 0f5c8cfb..362a24c6 100644 --- a/protocol/grpc/unit/unit.proto +++ b/protocol/grpc/unit/unit.proto @@ -35,6 +35,9 @@ service UnitService { rpc UnsubscribeFromChannel(google.protobuf.StringValue) returns (google.protobuf.Empty); rpc SubscribeToChannel(google.protobuf.StringValue) returns (stream ChannelManagement.ChannelMessageValue); + // Unit Information + rpc GetUnits(google.protobuf.Empty) returns (UnitInformation.UnitListResponse); + // Housekeeping rpc Reset(google.protobuf.Empty) returns (google.protobuf.Empty); @@ -91,4 +94,16 @@ message ChannelManagement { string data = 3; uint64 timestamp = 4; } +} + +// Unit Information +message UnitInformation { + message UnitListResponse { + repeated SimpleUnitValue units = 1; + } + + message SimpleUnitValue { + string name = 1; + string uuid = 2; + } } \ No newline at end of file From 63e99e033d0aac9b7bd0815170c7c34515c2be00 Mon Sep 17 00:00:00 2001 From: HttpRafa <60099368+HttpRafa@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:06:21 +0100 Subject: [PATCH 2/5] feat: Implemented /send command --- Cargo.toml | 2 +- .../cloud/common/cache/CachedObject.java | 5 +- .../common/connection/CloudConnection.java | 3 +- .../cloud/paper/command/CloudCommand.java | 1 + .../cloud/paper/command/SendCommand.java | 60 +++++++++++++++++++ .../cloud/paper/command/UnitCommand.java | 23 ------- .../paper/command/argument/UnitArgument.java | 55 +++++++++++------ protocol/grpc/unit/unit.proto | 1 + 8 files changed, 103 insertions(+), 47 deletions(-) create mode 100644 clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java delete mode 100644 clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java diff --git a/Cargo.toml b/Cargo.toml index 7e614e61..0581ca17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ ] [workspace.metadata] -protocol-version = 2 +protocol-version = 3 [profile.release] lto = true diff --git a/clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java b/clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java index ba6cd3cb..00423e71 100644 --- a/clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java +++ b/clients/jvm/common/src/main/java/io/atomic/cloud/common/cache/CachedObject.java @@ -10,8 +10,8 @@ public class CachedObject { private long invalidateTime; public synchronized Optional getValue() { - if(this.value == null) return Optional.empty(); - if(System.currentTimeMillis() > invalidateTime) { + if (this.value == null) return Optional.empty(); + if (System.currentTimeMillis() > invalidateTime) { this.value = null; return Optional.empty(); } @@ -22,5 +22,4 @@ public synchronized void setValue(T value) { this.value = value; this.invalidateTime = System.currentTimeMillis() + DEFAULT_EXPIRATION; } - } diff --git a/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java b/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java index 1140a3ad..9f57ad21 100644 --- a/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java +++ b/clients/jvm/common/src/main/java/io/atomic/cloud/common/connection/CloudConnection.java @@ -14,7 +14,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; @@ -130,7 +129,7 @@ public void subscribeToChannel(String channel, StreamObserver getUnitsNow() { var cached = this.unitsInfo.getValue(); - if(cached.isEmpty()) { + if (cached.isEmpty()) { this.getUnits(); // Request value from controller } return cached; diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/CloudCommand.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/CloudCommand.java index 859afa4a..e618f9aa 100644 --- a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/CloudCommand.java +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/CloudCommand.java @@ -8,6 +8,7 @@ import net.kyori.adventure.text.format.NamedTextColor; import org.jetbrains.annotations.NotNull; +@SuppressWarnings("UnstableApiUsage") public class CloudCommand { public static void register(@NotNull Commands commands) { diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java new file mode 100644 index 00000000..77b8a00f --- /dev/null +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java @@ -0,0 +1,60 @@ +package io.atomic.cloud.paper.command; + +import com.mojang.brigadier.Command; +import io.atomic.cloud.grpc.unit.TransferManagement; +import io.atomic.cloud.grpc.unit.UnitInformation; +import io.atomic.cloud.paper.CloudPlugin; +import io.atomic.cloud.paper.command.argument.UnitArgument; +import io.atomic.cloud.paper.permission.Permissions; +import io.papermc.paper.command.brigadier.Commands; +import io.papermc.paper.command.brigadier.argument.ArgumentTypes; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +@SuppressWarnings("UnstableApiUsage") +public class SendCommand { + + public static void register(@NotNull Commands commands) { + commands.register(Commands.literal("send") + .requires(Permissions.SERVER_COMMAND::check) + .then(Commands.argument("user", ArgumentTypes.players()) + .then(Commands.argument("unit", UnitArgument.INSTANCE).executes(context -> { + var sender = context.getSource().getSender(); + var connection = CloudPlugin.INSTANCE.connection(); + + @SuppressWarnings("unchecked") + var players = (List) context.getArgument("user", List.class); + var unit = context.getArgument("unit", UnitInformation.SimpleUnitValue.class); + var playerCount = players.size(); + + sender.sendRichMessage("Transferring " + playerCount + " to unit " + unit + "..."); + CompletableFuture.allOf(players.stream() + .map((player) -> connection.transferUser( + TransferManagement.TransferUserRequest.newBuilder() + .setUserUuid(player.getUniqueId() + .toString()) + .setTarget( + TransferManagement.TransferTargetValue.newBuilder() + .setTargetType( + TransferManagement + .TransferTargetValue + .TargetType.UNIT) + .setTarget(unit.getUuid())) + .build())) + .toArray(CompletableFuture[]::new)) + .whenComplete((result, throwable) -> { + if (throwable != null) { + sender.sendRichMessage("Failed to transfer " + playerCount + " to unit " + + unit + ": " + throwable.getMessage()); + } else { + sender.sendRichMessage( + "Submitted " + playerCount + " transfer requests to controller"); + } + }); + return Command.SINGLE_SUCCESS; + }))) + .build()); + } +} diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java deleted file mode 100644 index 28a23062..00000000 --- a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/UnitCommand.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.atomic.cloud.paper.command; - -import com.mojang.brigadier.Command; -import io.atomic.cloud.paper.command.argument.UnitArgument; -import io.atomic.cloud.paper.permission.Permissions; -import io.papermc.paper.command.brigadier.Commands; -import io.papermc.paper.command.brigadier.argument.ArgumentTypes; -import org.jetbrains.annotations.NotNull; - -public class UnitCommand { - - public static void register(@NotNull Commands commands) { - commands.register(Commands.literal("server") - .requires(Permissions.SERVER_COMMAND::check) - .then(Commands.argument("user", ArgumentTypes.players()).then(Commands.argument("unit", UnitArgument.INSTANCE).executes(context -> { - - // TODO: Command itself - - return Command.SINGLE_SUCCESS; - }))) - .build()); - } -} diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java index bf5c79ad..082deaa3 100644 --- a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java @@ -1,47 +1,66 @@ package io.atomic.cloud.paper.command.argument; -import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; +import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import io.atomic.cloud.grpc.unit.UnitInformation; import io.atomic.cloud.paper.CloudPlugin; -import net.minecraft.commands.SharedSuggestionProvider; -import net.minecraft.network.chat.Component; -import org.jetbrains.annotations.NotNull; - +import io.papermc.paper.command.brigadier.MessageComponentSerializer; +import io.papermc.paper.command.brigadier.argument.CustomArgumentType; import java.util.Arrays; import java.util.Collection; import java.util.concurrent.CompletableFuture; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; -public class UnitArgument implements ArgumentType { +@SuppressWarnings("UnstableApiUsage") +public class UnitArgument implements CustomArgumentType.Converted { public static final UnitArgument INSTANCE = new UnitArgument(); - private static final Collection EXAMPLES = Arrays.asList("lobby-1", "bedwars-2x1-1"); - public static final DynamicCommandExceptionType ERROR_STILL_FETCHING = new DynamicCommandExceptionType((_ignored) -> Component.literal("Fetching units...")); - public static final DynamicCommandExceptionType ERROR_NOT_FOUND = new DynamicCommandExceptionType((unit) -> Component.literal("\"" + unit + "\" does not exist")); @Override - public UnitInformation.SimpleUnitValue parse(@NotNull StringReader reader) throws CommandSyntaxException { - var unquotedString = reader.readUnquotedString(); + public UnitInformation.@NotNull SimpleUnitValue convert(@NotNull String value) throws CommandSyntaxException { var cached = CloudPlugin.INSTANCE.connection().getUnitsNow(); - if(cached.isEmpty()) throw ERROR_STILL_FETCHING.createWithContext(reader, unquotedString); - var unit = cached.get().getUnitsList().stream().filter(item -> item.getName().equals(unquotedString)).findFirst(); - if(unit.isEmpty()) throw ERROR_NOT_FOUND.createWithContext(reader, unquotedString); + if (cached.isEmpty()) throw createException("Fetching available units..."); + var unit = cached.get().getUnitsList().stream() + .filter(item -> item.getName().equals(value)) + .findFirst(); + if (unit.isEmpty()) throw createException("\"" + value + "\" does not exist"); return unit.get(); } @Override - public CompletableFuture listSuggestions(CommandContext context, SuggestionsBuilder builder) { - return CloudPlugin.INSTANCE.connection().getUnits().thenCompose(response -> SharedSuggestionProvider.suggest(response.getUnitsList().stream().map(UnitInformation.SimpleUnitValue::getName), builder)); + public @NotNull CompletableFuture listSuggestions( + @NotNull CommandContext context, @NotNull SuggestionsBuilder builder) { + return CloudPlugin.INSTANCE.connection().getUnits().thenCompose(response -> { + response.getUnitsList() + .forEach(unit -> builder.suggest( + unit.getName(), + MessageComponentSerializer.message() + .serialize(Component.text(unit.getName()).color(NamedTextColor.BLUE)))); + return builder.buildFuture(); + }); } @Override - public Collection getExamples() { + public @NotNull ArgumentType getNativeType() { + return StringArgumentType.word(); + } + + @Override + public @NotNull Collection getExamples() { return EXAMPLES; } + + @Contract("_ -> new") + private @NotNull CommandSyntaxException createException(@NotNull String message) { + return new CommandSyntaxException(new SimpleCommandExceptionType(() -> message), () -> message); + } } diff --git a/protocol/grpc/unit/unit.proto b/protocol/grpc/unit/unit.proto index 362a24c6..554e154a 100644 --- a/protocol/grpc/unit/unit.proto +++ b/protocol/grpc/unit/unit.proto @@ -105,5 +105,6 @@ message UnitInformation { message SimpleUnitValue { string name = 1; string uuid = 2; + optional string deployment = 3; } } \ No newline at end of file From 990c1bda11d1b13fbfe9a3fcb581c066fe7fcc66 Mon Sep 17 00:00:00 2001 From: HttpRafa <60099368+HttpRafa@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:10:51 +0100 Subject: [PATCH 3/5] feat: Implement required gRPCs on controller --- controller/src/network/unit.rs | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/controller/src/network/unit.rs b/controller/src/network/unit.rs index 961eaf57..00dfc10f 100644 --- a/controller/src/network/unit.rs +++ b/controller/src/network/unit.rs @@ -379,6 +379,31 @@ impl UnitService for UnitServiceImpl { Ok(Response::new(StdReceiverStream::new(receiver))) } + async fn get_units( + &self, + _request: Request<()>, + ) -> Result, Status> { + let units = self + .controller + .get_units() + .get_units() + .values() + .filter_map(|unit| Some(proto::unit_information::SimpleUnitValue { + name: unit.name.to_string(), + uuid: unit.uuid.to_string(), + deployment: unit + .deployment + .as_ref() + .and_then(|d| d.deployment.upgrade().map(|d| d.name.to_string())), + })) + .collect(); + + Ok(Response::new(proto::unit_information::UnitListResponse { + units, + })) + } + + async fn reset(&self, request: Request<()>) -> Result, Status> { let requesting_unit = request .extensions() From 012a26f085e942773453bf263ed3d7a81072f304 Mon Sep 17 00:00:00 2001 From: HttpRafa <60099368+HttpRafa@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:44:02 +0100 Subject: [PATCH 4/5] fix: Broken /send command --- .../cloud/paper/CloudPluginBootstrap.java | 5 ++-- .../cloud/paper/command/SendCommand.java | 23 ++++++++++--------- .../paper/command/argument/UnitArgument.java | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/CloudPluginBootstrap.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/CloudPluginBootstrap.java index 3dff3dd5..c523f6e7 100644 --- a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/CloudPluginBootstrap.java +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/CloudPluginBootstrap.java @@ -1,15 +1,15 @@ package io.atomic.cloud.paper; import io.atomic.cloud.paper.command.CloudCommand; +import io.atomic.cloud.paper.command.SendCommand; import io.papermc.paper.plugin.bootstrap.BootstrapContext; import io.papermc.paper.plugin.bootstrap.PluginBootstrap; import io.papermc.paper.plugin.bootstrap.PluginProviderContext; import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents; import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; -@ApiStatus.Experimental +@SuppressWarnings("UnstableApiUsage") public class CloudPluginBootstrap implements PluginBootstrap { @Override @@ -28,6 +28,7 @@ private void registerCommands(@NotNull BootstrapContext context) { manager.registerEventHandler(LifecycleEvents.COMMANDS, event -> { final var commands = event.registrar(); CloudCommand.register(commands); + SendCommand.register(commands); }); } } diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java index 77b8a00f..b54e3e30 100644 --- a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/SendCommand.java @@ -8,9 +8,8 @@ import io.atomic.cloud.paper.permission.Permissions; import io.papermc.paper.command.brigadier.Commands; import io.papermc.paper.command.brigadier.argument.ArgumentTypes; -import java.util.List; +import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver; import java.util.concurrent.CompletableFuture; -import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @SuppressWarnings("UnstableApiUsage") @@ -24,13 +23,14 @@ public static void register(@NotNull Commands commands) { var sender = context.getSource().getSender(); var connection = CloudPlugin.INSTANCE.connection(); - @SuppressWarnings("unchecked") - var players = (List) context.getArgument("user", List.class); + var users = context.getArgument("user", PlayerSelectorArgumentResolver.class) + .resolve(context.getSource()); var unit = context.getArgument("unit", UnitInformation.SimpleUnitValue.class); - var playerCount = players.size(); + var userCount = users.size(); - sender.sendRichMessage("Transferring " + playerCount + " to unit " + unit + "..."); - CompletableFuture.allOf(players.stream() + sender.sendRichMessage("Transferring " + userCount + + " users to unit " + unit.getName() + "..."); + CompletableFuture.allOf(users.stream() .map((player) -> connection.transferUser( TransferManagement.TransferUserRequest.newBuilder() .setUserUuid(player.getUniqueId() @@ -46,11 +46,12 @@ public static void register(@NotNull Commands commands) { .toArray(CompletableFuture[]::new)) .whenComplete((result, throwable) -> { if (throwable != null) { - sender.sendRichMessage("Failed to transfer " + playerCount + " to unit " - + unit + ": " + throwable.getMessage()); - } else { sender.sendRichMessage( - "Submitted " + playerCount + " transfer requests to controller"); + "Failed to transfer " + userCount + " users to unit " + + unit.getName() + ": " + throwable.getMessage()); + } else { + sender.sendRichMessage("Submitted " + userCount + + " transfer requests to controller"); } }); return Command.SINGLE_SUCCESS; diff --git a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java index 082deaa3..6eecdf86 100644 --- a/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java +++ b/clients/jvm/paper/src/main/java/io/atomic/cloud/paper/command/argument/UnitArgument.java @@ -44,7 +44,7 @@ public class UnitArgument implements CustomArgumentType.Converted builder.suggest( unit.getName(), MessageComponentSerializer.message() - .serialize(Component.text(unit.getName()).color(NamedTextColor.BLUE)))); + .serialize(Component.text(unit.getUuid()).color(NamedTextColor.BLUE)))); return builder.buildFuture(); }); } From 2a1f16a27d07b486cacdba168612cf039695eaf1 Mon Sep 17 00:00:00 2001 From: HttpRafa <60099368+HttpRafa@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:49:14 +0100 Subject: [PATCH 5/5] fix: Clippy errors --- controller/src/application/event.rs | 2 +- controller/src/network/unit.rs | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/controller/src/application/event.rs b/controller/src/application/event.rs index e718f2d5..d5acd787 100644 --- a/controller/src/application/event.rs +++ b/controller/src/application/event.rs @@ -148,4 +148,4 @@ impl Hash for EventKey { }*/ } } -} \ No newline at end of file +} diff --git a/controller/src/network/unit.rs b/controller/src/network/unit.rs index 00dfc10f..abaf239e 100644 --- a/controller/src/network/unit.rs +++ b/controller/src/network/unit.rs @@ -388,14 +388,14 @@ impl UnitService for UnitServiceImpl { .get_units() .get_units() .values() - .filter_map(|unit| Some(proto::unit_information::SimpleUnitValue { - name: unit.name.to_string(), + .map(|unit| proto::unit_information::SimpleUnitValue { + name: unit.name.clone(), uuid: unit.uuid.to_string(), deployment: unit .deployment .as_ref() - .and_then(|d| d.deployment.upgrade().map(|d| d.name.to_string())), - })) + .and_then(|d| d.deployment.upgrade().map(|d| d.name.clone())), + }) .collect(); Ok(Response::new(proto::unit_information::UnitListResponse { @@ -403,7 +403,6 @@ impl UnitService for UnitServiceImpl { })) } - async fn reset(&self, request: Request<()>) -> Result, Status> { let requesting_unit = request .extensions()