The-pack-family
/
APIv3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

original code

This commit is contained in:
GoXLR 2022-10-19 17:57:51 +02:00
parent 9f2ad2d73a
commit 1cbe4aa462
No known key found for this signature in database
GPG Key ID: 5B163CA341BAA2EA
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -9,7 +9,3 @@
# Maven # Maven
log/ log/
target/ target/
dependency-reduced-pom.xml
# Java
*.jar

2
pom.xml
View File

@ -143,7 +143,7 @@
<dependency> <dependency>
<groupId>org.mongodb</groupId> <groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-async</artifactId> <artifactId>mongodb-driver-async</artifactId>
<version>3.2.2</version> <version>3.12.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>fr.javatic.mongo</groupId> <groupId>fr.javatic.mongo</groupId>

2
src/main/java/net/frozenorb/apiv3/web/route/serverGroups/POSTServerGroups.java
View File

@ -25,7 +25,7 @@ public final class POSTServerGroups implements Handler<RoutingContext> {
String image = requestBody.getString("image"); String image = requestBody.getString("image");
ServerGroup serverGroup = new ServerGroup(id, image); ServerGroup serverGroup = new ServerGroup(id, image);
SyncUtils.<Void>runBlocking(v -> serverGroup.insert(v)); SyncUtils.<Void>runBlocking(serverGroup::insert);
if (requestBody.containsKey("addedBy")) { if (requestBody.containsKey("addedBy")) {
AuditLog.log(UuidUtils.parseUuid(requestBody.getString("addedBy")), requestBody.getString("addedByIp"), ctx, AuditLogActionType.SERVER_GROUP_CREATE, ImmutableMap.of("serverGroupId", id), (ignored, error) -> { AuditLog.log(UuidUtils.parseUuid(requestBody.getString("addedBy")), requestBody.getString("addedByIp"), ctx, AuditLogActionType.SERVER_GROUP_CREATE, ImmutableMap.of("serverGroupId", id), (ignored, error) -> {

20
src/main/java/net/frozenorb/apiv3/web/route/servers/POSTServersHeartbeat.java
View File

@ -48,6 +48,7 @@ public final class POSTServersHeartbeat implements Handler<RoutingContext> {
Server actorServer = Server.findById(actor.getName()); Server actorServer = Server.findById(actor.getName());
JsonObject requestBody = ctx.getBodyAsJson(); JsonObject requestBody = ctx.getBodyAsJson();
System.out.println("body: " + requestBody);
JsonObject players = requestBody.getJsonObject("players"); JsonObject players = requestBody.getJsonObject("players");
Map<UUID, String> playerNames = extractPlayerNames(players); Map<UUID, String> playerNames = extractPlayerNames(players);
Map<UUID, String> playerIps = extractPlayerIps(players); Map<UUID, String> playerIps = extractPlayerIps(players);
@ -67,6 +68,7 @@ public final class POSTServersHeartbeat implements Handler<RoutingContext> {
"events", result.result().result(3) "events", result.result().result(3)
)); ));
} else { } else {
result.cause().printStackTrace();
ErrorUtils.respondInternalError(ctx, result.cause()); ErrorUtils.respondInternalError(ctx, result.cause());
} }
}); });
@ -75,14 +77,16 @@ public final class POSTServersHeartbeat implements Handler<RoutingContext> {
private Future<Void> createInfoResponse(Server server, double tps, Map<UUID, String> playerNames) { private Future<Void> createInfoResponse(Server server, double tps, Map<UUID, String> playerNames) {
Future<Void> callback = Future.future(); Future<Void> callback = Future.future();
server.receivedHeartbeat(tps, playerNames.keySet()); if (server != null && playerNames != null) {
server.save((ignored, error) -> { server.receivedHeartbeat(tps, playerNames.keySet());
if (error != null) { server.save((ignored, error) -> {
callback.fail(error); if (error != null) {
} else { callback.fail(error);
callback.complete(); } else {
} callback.complete();
}); }
});
}
return callback; return callback;
} }