Skip to content

Fix: Refactor blocking tasks to be asynchronous #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
google-labs-jules wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft

Fix: Refactor blocking tasks to be asynchronous #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions zander-velocity/src/main/java/org/modularsoft/zander/velocity/ZanderVelocityMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ public class ZanderVelocityMain {
private static YamlDocument config;
@Getter
private final CommandManager commandManager;
@Getter
private static ZanderVelocityMain instance;

@Subscribe
public void onProxyInitialization(ProxyInitializeEvent event) {
Expand Down Expand Up @@ -94,6 +96,7 @@ public ZanderVelocityMain(
this.proxy = proxy;
this.logger = logger;
this.commandManager = commandManager;
instance = this;

// Create configuration file
try {
Expand Down
54 changes: 25 additions & 29 deletions ...er-velocity/src/main/java/org/modularsoft/zander/velocity/events/session/UserOnLogin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import dev.dejvokep.boostedyaml.route.Route;
import io.github.ModularEnigma.Request;
import io.github.ModularEnigma.Response;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.modularsoft.zander.velocity.ZanderVelocityMain;
import org.modularsoft.zander.velocity.model.discord.DiscordJoin;
import org.modularsoft.zander.velocity.model.session.SessionCreate;
Expand All @@ -17,29 +15,30 @@ public class UserOnLogin {
@Subscribe
public void UserLoginEvent (PostLoginEvent event) {
Player player = event.getPlayer();
String BaseAPIURL = ZanderVelocityMain.getConfig().getString(Route.from("BaseAPIURL"));
String APIKey = ZanderVelocityMain.getConfig().getString(Route.from("APIKey"));

try {
//
// Send User Creation API POST for new user
//
UserCreation createUser = UserCreation.builder()
.uuid(player.getUniqueId())
.username(player.getUsername())
.build();
ZanderVelocityMain.getProxy().getScheduler().buildTask(ZanderVelocityMain.getInstance(), () -> {
String BaseAPIURL = ZanderVelocityMain.getConfig().getString(Route.from("BaseAPIURL"));
String APIKey = ZanderVelocityMain.getConfig().getString(Route.from("APIKey"));

Request createUserReq = Request.builder()
.setURL(BaseAPIURL + "/user/create")
.setMethod(Request.Method.POST)
.addHeader("x-access-token", APIKey)
.setRequestBody(createUser.toString())
.build();
try {
//
// Send User Creation API POST for new user
//
UserCreation createUser = UserCreation.builder()
.uuid(player.getUniqueId())
.username(player.getUsername())
.build();

Response createUserRes = createUserReq.execute();
ZanderVelocityMain.getLogger().info("Response (" + createUserRes.getStatusCode() + "): " + createUserRes.getBody());
Request createUserReq = Request.builder()
.setURL(BaseAPIURL + "/user/create")
.setMethod(Request.Method.POST)
.addHeader("x-access-token", APIKey)
.setRequestBody(createUser.toString())
.build();

Response createUserRes = createUserReq.execute();
ZanderVelocityMain.getLogger().info("User creation response (" + createUserRes.getStatusCode() + "): " + createUserRes.getBody());

try {
//
// Start Session API POST
//
Expand All @@ -56,7 +55,7 @@ public void UserLoginEvent (PostLoginEvent event) {
.build();

Response createSessionRes = createSessionReq.execute();
ZanderVelocityMain.getLogger().info("Response (" + createSessionRes.getStatusCode() + "): " + createSessionRes.getBody());
ZanderVelocityMain.getLogger().info("Session creation response (" + createSessionRes.getStatusCode() + "): " + createSessionRes.getBody());

// Send Discord API POST for join message
DiscordJoin join = DiscordJoin.builder()
Expand All @@ -71,14 +70,11 @@ public void UserLoginEvent (PostLoginEvent event) {
.build();

Response discordJoinRes = discordJoinReq.execute();
ZanderVelocityMain.getLogger().info("Response (" + discordJoinRes.getStatusCode() + "): " + discordJoinRes.getBody());
ZanderVelocityMain.getLogger().info("Discord join response (" + discordJoinRes.getStatusCode() + "): " + discordJoinRes.getBody());

} catch (Exception e) {
Component builder = Component.text("An error has occurred. Is the API down?").color(NamedTextColor.RED);
player.disconnect(builder);
ZanderVelocityMain.getLogger().error("An error occurred during the async login process for " + player.getUsername(), e);
}
} catch (Exception e) {
Component builder = Component.text("An error has occurred. Is the API down?").color(NamedTextColor.RED);
player.disconnect(builder);
}
}).schedule();
}
}
15 changes: 5 additions & 10 deletions ...-velocity/src/main/java/org/modularsoft/zander/velocity/util/announcement/TipChatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

public class TipChatter {
Expand All @@ -24,12 +22,9 @@ public static void startAnnouncementTipTask() {
String BaseAPIURL = ZanderVelocityMain.getConfig().getString(Route.from("BaseAPIURL"));
String APIKey = ZanderVelocityMain.getConfig().getString(Route.from("APIKey"));
String announcementTipPrefix = ZanderVelocityMain.getConfig().getString(Route.from("announcementTipPrefix"));
int interval = ZanderVelocityMain.getConfig().getInt(Route.from("announcementTipInterval"));

// Create a ScheduledExecutorService with a single thread
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);

// Schedule the task to run every 10 seconds
scheduler.scheduleAtFixedRate(() -> {
ZanderVelocityMain.getProxy().getScheduler().buildTask(ZanderVelocityMain.getInstance(), () -> {
try {
// GET request to fetch Announcement Tip.
Request req = Request.builder()
Expand Down Expand Up @@ -64,8 +59,8 @@ public static void startAnnouncementTipTask() {
} catch (Exception e) {
// Handle exceptions here
logger.error("Announcement Tip Failed, will try again later.", e);
System.out.println("Announcement Tip Failed, will try again in " + ZanderVelocityMain.getConfig().getString(Route.from("announcementTipInterval")) + " minutes.");
System.out.println("Announcement Tip Failed, will try again in " + interval + " minutes.");
}
}, 0, ZanderVelocityMain.getConfig().getInt(Route.from("announcementTipInterval")), TimeUnit.MINUTES);
}).repeat(interval, TimeUnit.MINUTES).schedule();
}
}
}
12 changes: 3 additions & 9 deletions zander-velocity/src/main/java/org/modularsoft/zander/velocity/util/api/Heartbeat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,14 @@
import net.kyori.adventure.text.format.NamedTextColor;
import org.modularsoft.zander.velocity.ZanderVelocityMain;

import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

public class Heartbeat {
public static void startHeartbeatTask() {
String BaseAPIURL = ZanderVelocityMain.getConfig().getString(Route.from("BaseAPIURL"));
String APIKey = ZanderVelocityMain.getConfig().getString(Route.from("APIKey"));

// Create a ScheduledExecutorService with a single thread
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);

// Schedule the task to run every 60 seconds
scheduler.scheduleAtFixedRate(() -> {
ZanderVelocityMain.getProxy().getScheduler().buildTask(ZanderVelocityMain.getInstance(), () -> {
try {
// Your existing code here
// GET request to link to rules.
Expand Down Expand Up @@ -57,6 +51,6 @@ public static void startHeartbeatTask() {
player.disconnect(message);
});
}
}, 0, 60, TimeUnit.SECONDS);
}).repeat(60, TimeUnit.SECONDS).schedule();
}
}
}