MinecraftUtilities/Backend
1
1
Fork 1
Code Issues 1 Pull Requests 6 Actions Activity

change api format
Some checks failed
Deploy App / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Failing after 28s
Details

Browse Source
This commit is contained in:
Lee 2024-04-17 16:35:52 +01:00
parent 632d33197d
commit ecca157d86
7 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/xyz/mcutils/backend/common/EndpointStatus.java → src/main/java/xyz/mcutils/backend/common/Endpoint.java
View File

@ -7,7 +7,7 @@ import org.springframework.http.HttpStatusCode;
import java.util.List;
@AllArgsConstructor @Getter
public class EndpointStatus {
public class Endpoint {
/**
* The endpoint.

32
src/main/java/xyz/mcutils/backend/model/cache/CachedEndpointStatus.java vendored
View File

@ -1,16 +1,17 @@
package xyz.mcutils.backend.model.cache;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import lombok.*;
import org.springframework.data.annotation.Id;
import org.springframework.data.redis.core.RedisHash;
import xyz.mcutils.backend.common.CachedResponse;
import xyz.mcutils.backend.model.mojang.EndpointStatus;
import java.io.Serializable;
import java.util.Map;
@Setter @Getter @ToString
@NoArgsConstructor
@RedisHash(value = "mojangEndpointStatus", timeToLive = 60L) // 1 minute (in seconds)
public class CachedEndpointStatus extends CachedResponse implements Serializable {
@ -18,34 +19,17 @@ public class CachedEndpointStatus extends CachedResponse implements Serializable
* The id for this endpoint cache.
*/
@Id @NonNull @JsonIgnore
private String id;
private final String id;
/**
* The list of endpoints and their status.
* The endpoint cache.
*/
private Map<String, Status> endpoints;
@JsonUnwrapped
private final EndpointStatus value;
public CachedEndpointStatus(@NonNull String id, Map<String, Status> endpoints) {
public CachedEndpointStatus(@NonNull String id, EndpointStatus value) {
super(Cache.defaultCache());
this.id = id;
this.endpoints = endpoints;
}
public enum Status {
/**
* The service is online and operational.
*/
ONLINE,
/**
* The service is online, but may be experiencing issues.
* This could be due to high load or other issues.
*/
DEGRADED,
/**
* The service is offline and not operational.
*/
OFFLINE
this.value = value;
}
}

3
src/main/java/xyz/mcutils/backend/model/cache/CachedMinecraftServer.java vendored
View File

@ -1,6 +1,7 @@
package xyz.mcutils.backend.model.cache;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import lombok.*;
import org.springframework.data.annotation.Id;
import org.springframework.data.redis.core.RedisHash;
@ -25,7 +26,7 @@ public class CachedMinecraftServer extends CachedResponse implements Serializabl
/**
* The cached server.
*/
@NonNull
@NonNull @JsonUnwrapped
private MinecraftServer server;
public CachedMinecraftServer(@NonNull String id, @NonNull MinecraftServer server) {

2
src/main/java/xyz/mcutils/backend/model/cache/CachedPlayer.java vendored
View File

@ -1,6 +1,7 @@
package xyz.mcutils.backend.model.cache;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@ -30,6 +31,7 @@ public class CachedPlayer extends CachedResponse implements Serializable {
/**
* The player to cache.
*/
@JsonUnwrapped
private Player player;
public CachedPlayer(UUID uniqueId, Player player) {

39
src/main/java/xyz/mcutils/backend/model/mojang/EndpointStatus.java Normal file
View File

@ -0,0 +1,39 @@
package xyz.mcutils.backend.model.mojang;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
import org.springframework.data.annotation.Id;
import xyz.mcutils.backend.common.CachedResponse;
import xyz.mcutils.backend.model.cache.CachedEndpointStatus;
import java.util.Map;
@AllArgsConstructor
@Getter
public class EndpointStatus {
/**
* The list of endpoints and their status.
*/
private final Map<String, Status> endpoints;
public enum Status {
/**
* The service is online and operational.
*/
ONLINE,
/**
* The service is online, but may be experiencing issues.
* This could be due to high load or other issues.
*/
DEGRADED,
/**
* The service is offline and not operational.
*/
OFFLINE
}
}

37
src/main/java/xyz/mcutils/backend/service/MojangService.java
View File

@ -14,11 +14,12 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import xyz.mcutils.backend.Main;
import xyz.mcutils.backend.common.EndpointStatus;
import xyz.mcutils.backend.common.Endpoint;
import xyz.mcutils.backend.common.ExpiringSet;
import xyz.mcutils.backend.common.WebRequest;
import xyz.mcutils.backend.config.Config;
import xyz.mcutils.backend.model.cache.CachedEndpointStatus;
import xyz.mcutils.backend.model.mojang.EndpointStatus;
import xyz.mcutils.backend.model.token.MojangProfileToken;
import xyz.mcutils.backend.model.token.MojangUsernameToUuidToken;
import xyz.mcutils.backend.repository.EndpointStatusRepository;
@ -55,14 +56,14 @@ public class MojangService {
* Information about the Mojang API endpoints.
*/
private static final String MOJANG_ENDPOINT_STATUS_KEY = "mojang";
private static final List<EndpointStatus> MOJANG_ENDPOINTS = List.of(
new EndpointStatus("https://textures.minecraft.net", List.of(HttpStatus.BAD_REQUEST)),
new EndpointStatus("https://session.minecraft.net", List.of(HttpStatus.NOT_FOUND)),
new EndpointStatus("https://libraries.minecraft.net", List.of(HttpStatus.NOT_FOUND)),
new EndpointStatus("https://assets.mojang.com", List.of(HttpStatus.NOT_FOUND)),
new EndpointStatus("https://api.minecraftservices.com", List.of(HttpStatus.FORBIDDEN)),
new EndpointStatus(API_ENDPOINT, List.of(HttpStatus.OK)),
new EndpointStatus(SESSION_SERVER_ENDPOINT, List.of(HttpStatus.FORBIDDEN))
private static final List<Endpoint> MOJANG_ENDPOINTS = List.of(
new Endpoint("https://textures.minecraft.net", List.of(HttpStatus.BAD_REQUEST)),
new Endpoint("https://session.minecraft.net", List.of(HttpStatus.NOT_FOUND)),
new Endpoint("https://libraries.minecraft.net", List.of(HttpStatus.NOT_FOUND)),
new Endpoint("https://assets.mojang.com", List.of(HttpStatus.NOT_FOUND)),
new Endpoint("https://api.minecraftservices.com", List.of(HttpStatus.FORBIDDEN)),
new Endpoint(API_ENDPOINT, List.of(HttpStatus.OK)),
new Endpoint(SESSION_SERVER_ENDPOINT, List.of(HttpStatus.FORBIDDEN))
);
@Autowired
@ -195,9 +196,9 @@ public class MojangService {
}
// Fetch the status of the Mojang API endpoints
List<CompletableFuture<CachedEndpointStatus.Status>> futures = new ArrayList<>();
for (EndpointStatus endpoint : MOJANG_ENDPOINTS) {
CompletableFuture<CachedEndpointStatus.Status> future = CompletableFuture.supplyAsync(() -> {
List<CompletableFuture<EndpointStatus.Status>> futures = new ArrayList<>();
for (Endpoint endpoint : MOJANG_ENDPOINTS) {
CompletableFuture<EndpointStatus.Status> future = CompletableFuture.supplyAsync(() -> {
boolean online = false;
long start = System.currentTimeMillis();
ResponseEntity<?> response = WebRequest.head(endpoint.getEndpoint(), String.class);
@ -205,9 +206,9 @@ public class MojangService {
online = true;
}
if (online && System.currentTimeMillis() - start > 1000) { // If the response took longer than 1 second
return CachedEndpointStatus.Status.DEGRADED;
return EndpointStatus.Status.DEGRADED;
}
return online ? CachedEndpointStatus.Status.ONLINE : CachedEndpointStatus.Status.OFFLINE;
return online ? EndpointStatus.Status.ONLINE : EndpointStatus.Status.OFFLINE;
}, Main.EXECUTOR_POOL);
futures.add(future);
@ -220,17 +221,17 @@ public class MojangService {
}
// Process the results
Map<String, CachedEndpointStatus.Status> endpoints = new HashMap<>();
Map<String, EndpointStatus.Status> endpoints = new HashMap<>();
for (int i = 0; i < MOJANG_ENDPOINTS.size(); i++) {
EndpointStatus endpoint = MOJANG_ENDPOINTS.get(i);
CachedEndpointStatus.Status status = futures.get(i).join();
Endpoint endpoint = MOJANG_ENDPOINTS.get(i);
EndpointStatus.Status status = futures.get(i).join();
endpoints.put(endpoint.getEndpoint(), status);
}
log.info("Fetched Mojang API status for {} endpoints", endpoints.size());
CachedEndpointStatus status = new CachedEndpointStatus(
MOJANG_ENDPOINT_STATUS_KEY,
endpoints
new EndpointStatus(endpoints)
);
mojangEndpointStatusRepository.save(status);
status.getCache().setCached(false);

1
src/main/java/xyz/mcutils/backend/service/metric/metrics/process/CpuUsageMetric.java
View File

@ -15,7 +15,6 @@ public class CpuUsageMetric extends DoubleMetric {
super("cpu_usage");
}
@Override
public void collect() {
this.setValue(OS_BEAN.getProcessCpuLoad() * 100);