Implement websocket matches

Co-authored-by: Pablete1234 <[email protected]>
Signed-off-by: Pablete1234 <[email protected]>

.gitignore

@@ -25,6 +25,9 @@ local.properties
 .classpath
 .project
 
+# VSCode
+.vscode
+
 # External tool builders
 .externalToolBuilders/
 

pom.xml

@@ -47,15 +47,15 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.applenick</groupId>
+			<groupId>com.github.Pablete1234</groupId>
 			<artifactId>PGM</artifactId>
 			<version>community-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.PGMDev</groupId>
+			<groupId>com.github.bolt-rip</groupId>
 			<artifactId>Events</artifactId>
-			<version>070c088acd</version>
+			<version>team-refactor-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -78,6 +78,11 @@
 			<artifactId>taskchain-bukkit</artifactId>
 			<version>3.7.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.java-websocket</groupId>
+			<artifactId>Java-WebSocket</artifactId>
+			<version>1.5.1</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/rip/bolt/ingame/Ingame.java

@@ -3,30 +3,42 @@
 import co.aikar.taskchain.BukkitTaskChainFactory;
 import co.aikar.taskchain.TaskChain;
 import co.aikar.taskchain.TaskChainFactory;
-import dev.pgm.events.Tournament;
+import dev.pgm.events.EventsPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 import rip.bolt.ingame.api.APIManager;
+import rip.bolt.ingame.commands.AdminCommands;
 import rip.bolt.ingame.commands.ForfeitCommands;
-import rip.bolt.ingame.commands.RankedAdminCommands;
+import rip.bolt.ingame.commands.PugCommands;
 import rip.bolt.ingame.commands.RequeueCommands;
-import rip.bolt.ingame.ranked.RankedManager;
+import rip.bolt.ingame.managers.MatchManager;
+import rip.bolt.ingame.utils.AudienceProvider;
+import rip.bolt.ingame.utils.MapInfoParser;
+import rip.bolt.ingame.utils.PartyProvider;
+import rip.bolt.ingame.utils.TeamsProvider;
 import tc.oc.pgm.api.PGM;
+import tc.oc.pgm.api.map.MapInfo;
+import tc.oc.pgm.api.map.MapOrder;
 import tc.oc.pgm.api.match.Match;
+import tc.oc.pgm.api.party.Party;
 import tc.oc.pgm.api.player.MatchPlayer;
 import tc.oc.pgm.command.graph.CommandExecutor;
 import tc.oc.pgm.command.graph.MatchPlayerProvider;
 import tc.oc.pgm.command.graph.MatchProvider;
 import tc.oc.pgm.lib.app.ashcon.intake.bukkit.graph.BasicBukkitCommandGraph;
 import tc.oc.pgm.lib.app.ashcon.intake.fluent.DispatcherNode;
 import tc.oc.pgm.lib.app.ashcon.intake.parametric.AbstractModule;
+import tc.oc.pgm.teams.TeamMatchModule;
+import tc.oc.pgm.util.Audience;
 
 public class Ingame extends JavaPlugin {
 
   private static TaskChainFactory taskChainFactory;
-  private RankedManager rankedManager;
+  private MatchManager matchManager;
   private APIManager apiManager;
 
+  private PugCommands pugCommands;
+
   private static Ingame plugin;
 
   @Override
@@ -38,22 +50,25 @@ public void onEnable() {
 
     apiManager = new APIManager();
 
-    rankedManager = new RankedManager(this);
+    matchManager = new MatchManager(this);
 
-    Bukkit.getPluginManager().registerEvents(rankedManager, this);
-    Bukkit.getPluginManager().registerEvents(rankedManager.getPlayerWatcher(), this);
-    Bukkit.getPluginManager().registerEvents(rankedManager.getRankManager(), this);
-    Bukkit.getPluginManager().registerEvents(rankedManager.getRequeueManager(), this);
-    Bukkit.getPluginManager().registerEvents(rankedManager.getSpectatorManager(), this);
-    Bukkit.getPluginManager().registerEvents(rankedManager.getKnockbackManager(), this);
+    Bukkit.getPluginManager().registerEvents(matchManager, this);
+    Bukkit.getPluginManager().registerEvents(matchManager.getRankManager(), this);
 
     BasicBukkitCommandGraph g = new BasicBukkitCommandGraph(new CommandModule());
     DispatcherNode node = g.getRootDispatcherNode();
-    node.registerCommands(new RequeueCommands(rankedManager));
-    node.registerCommands(new ForfeitCommands(rankedManager));
+    node.registerCommands(new RequeueCommands(matchManager));
+    node.registerCommands(new ForfeitCommands(matchManager));
+
+    node.registerNode("ingame").registerCommands(new AdminCommands(matchManager));
+
+    DispatcherNode pugNode = node.registerNode("pug");
+    pugCommands = new PugCommands(matchManager);
+    pugNode.registerCommands(pugCommands);
+    pugNode.registerNode("team").registerCommands(pugCommands.getTeamCommands());
+
+    pugCommands.setCommandList(pugNode.getDispatcher().getAliases());
 
-    DispatcherNode subNode = node.registerNode("ingame");
-    subNode.registerCommands(new RankedAdminCommands(rankedManager));
     new CommandExecutor(this, g).register();
 
     System.out.println("[Ingame] Ingame is now enabled!");
@@ -77,8 +92,12 @@ public APIManager getApiManager() {
     return apiManager;
   }
 
-  public RankedManager getRankedManager() {
-    return rankedManager;
+  public MatchManager getMatchManager() {
+    return matchManager;
+  }
+
+  public PugCommands getPugCommands() {
+    return pugCommands;
   }
 
   public static Ingame get() {
@@ -95,12 +114,17 @@ protected void configure() {
 
     private void configureInstances() {
       bind(PGM.class).toInstance(PGM.get());
-      bind(Tournament.class).toInstance(Tournament.get());
+      bind(EventsPlugin.class).toInstance(EventsPlugin.get());
+      bind(MapOrder.class).toInstance(PGM.get().getMapOrder());
     }
 
     private void configureProviders() {
       bind(MatchPlayer.class).toProvider(new MatchPlayerProvider());
       bind(Match.class).toProvider(new MatchProvider());
+      bind(Party.class).toProvider(new PartyProvider());
+      bind(TeamMatchModule.class).toProvider(new TeamsProvider());
+      bind(Audience.class).toProvider(new AudienceProvider());
+      bind(MapInfo.class).toProvider(new MapInfoParser());
     }
   }
 }

src/main/java/rip/bolt/ingame/api/APIException.java

@@ -0,0 +1,14 @@
+package rip.bolt.ingame.api;
+
+public class APIException extends RuntimeException {
+  private final int code;
+
+  public APIException(String message, int code) {
+    super(message + " (" + code + ")");
+    this.code = code;
+  }
+
+  public int getCode() {
+    return code;
+  }
+}

src/main/java/rip/bolt/ingame/api/APIManager.java

@@ -14,10 +14,13 @@
 public class APIManager {
 
   private final String serverId;
+
   public final APIService apiService;
+  public final ObjectMapper objectMapper;
 
   public APIManager() {
     serverId = AppData.API.getServerName();
+    objectMapper = new ObjectMapper().registerModule(new DateModule());
 
     ObjectMapper objectMapper = new ObjectMapper().registerModule(new DateModule());
     objectMapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
@@ -57,19 +60,31 @@ public BoltResponse postPlayerRequeue(UUID uuid) {
 
   public BoltMatch postMatch(BoltMatch match) {
     int retries = 40;
+
+    final int PRECONDITION_FAILED = 412;
+
     for (int i = 0; i < retries; ) {
       try {
         return apiService.postMatch(match.getId(), match);
+      } catch (APIException ex) {
+        ex.printStackTrace();
+        if (ex.getCode() == PRECONDITION_FAILED && i > 2) return match;
       } catch (Exception ex) {
-        i += 1;
-
-        System.out.println(
-            "Failed to report match end, retrying in " + (i * 5) + "s (" + i + "/" + retries + ")");
         ex.printStackTrace();
-        try {
-          Thread.sleep(i * 5000L);
-        } catch (InterruptedException ignore) {
-        }
+      }
+
+      i += 1;
+      System.out.println(
+          "[Ingame] Failed to report match end, retrying in "
+              + (i * 5)
+              + "s ("
+              + i
+              + "/"
+              + retries
+              + ")");
+      try {
+        Thread.sleep(i * 5000L);
+      } catch (InterruptedException ignore) {
       }
     }
     return null;

src/main/java/rip/bolt/ingame/api/DateModule.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonSerializer;
@@ -30,7 +29,7 @@ public void serialize(
   private static class InstantDeserializer extends JsonDeserializer<Instant> {
     @Override
     public Instant deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-        throws IOException, JsonProcessingException {
+        throws IOException {
       return Instant.parse(jsonParser.getValueAsString());
     }
   }

src/main/java/rip/bolt/ingame/api/DefaultCallAdapterFactory.java

@@ -25,7 +25,8 @@ private static String getErrorMessage(final retrofit2.Response<?> response) {
     try (ResponseBody errorBody = response.errorBody()) {
       return Objects.isNull(errorBody) ? response.message() : errorBody.string();
     } catch (IOException e) {
-      throw new RuntimeException("could not read error body", e);
+      e.printStackTrace();
+      return "Failed to read error message";
     }
   }
 
@@ -57,7 +58,7 @@ public Object adapt(final Call<T> call) {
         if (response.code() == NOT_FOUND) {
           return null;
         }
-        throw new RuntimeException(getErrorMessage(response));
+        throw new APIException(getErrorMessage(response), response.code());
       }
       return response.body();
     }

src/main/java/rip/bolt/ingame/api/definitions/BoltMatch.java

@@ -5,12 +5,14 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
-import rip.bolt.ingame.ranked.MatchStatus;
+import java.util.stream.Collectors;
+import rip.bolt.ingame.api.definitions.pug.PugMatch;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class BoltMatch {
 
   private String id;
+  private String lobbyId;
   private Series series;
 
   private BoltPGMMap map;
@@ -29,6 +31,15 @@ public BoltMatch(String matchId) {
     this.id = matchId;
   }
 
+  public BoltMatch(String lobbyId, Series series, PugMatch pugMatch) {
+    this.id = pugMatch.getId();
+    this.lobbyId = lobbyId;
+    this.series = series;
+    this.map = pugMatch.getMap();
+    this.teams = pugMatch.getTeamIds().stream().map(Team::new).collect(Collectors.toList());
+    this.status = pugMatch.getStatus();
+  }
+
   public String getId() {
     return id;
   }
@@ -37,6 +48,14 @@ public void setId(String id) {
     this.id = id;
   }
 
+  public String getLobbyId() {
+    return lobbyId;
+  }
+
+  public void setLobbyId(String lobbyId) {
+    this.lobbyId = lobbyId;
+  }
+
   public Series getSeries() {
     return series;
   }
@@ -93,6 +112,15 @@ public void setStatus(MatchStatus status) {
     this.status = status;
   }
 
+  public Participation getParticipation(UUID uuid) {
+    return teams.stream()
+        .map(Team::getParticipations)
+        .flatMap(Collection::stream)
+        .filter(participation -> participation.getUser().getUUID().equals(uuid))
+        .findFirst()
+        .orElse(null);
+  }
+
   public User getUser(UUID uuid) {
     return teams.stream()
         .map(Team::getParticipations)
@@ -110,6 +138,9 @@ public String toString() {
             .append("Match ID: ")
             .append(getId())
             .append("\n")
+            .append("Lobby ID: ")
+            .append(getLobbyId())
+            .append("\n")
             .append("Series: ")
             .append(getSeries())
             .append("\n")

src/main/java/rip/bolt/ingame/api/definitions/BoltPGMMap.java

@@ -7,6 +7,7 @@ public class BoltPGMMap {
 
   private Integer id;
   private String name;
+  private String slug;
 
   public BoltPGMMap() {}
 
@@ -34,8 +35,16 @@ public void setName(String name) {
     this.name = name;
   }
 
+  public String getSlug() {
+    return slug;
+  }
+
+  public void setSlug(String slug) {
+    this.slug = slug;
+  }
+
   @Override
   public String toString() {
-    return "{" + " id='" + getId() + "'" + ", name='" + getName() + "'" + "}";
+    return "BoltPGMMap{" + "id=" + id + ", name='" + name + '\'' + ", slug='" + slug + '\'' + '}';
   }
 }

src/main/java/rip/bolt/ingame/ranked/MatchStatus.java → src/main/java/rip/bolt/ingame/api/definitions/MatchStatus.java

@@ -1,11 +1,11 @@
-package rip.bolt.ingame.ranked;
+package rip.bolt.ingame.api.definitions;
 
 public enum MatchStatus {
   CREATED,
   LOADED,
+  CANCELLED,
   STARTED,
-  ENDED,
-  CANCELLED;
+  ENDED;
 
   public boolean canTransitionTo(MatchStatus next) {
     switch (this) {
@@ -23,6 +23,14 @@ public boolean canTransitionTo(MatchStatus next) {
     }
   }
 
+  public boolean isPreGame() {
+    return this == CREATED || this == LOADED;
+  }
+
+  public boolean isFinished() {
+    return this == ENDED || this == CANCELLED;
+  }
+
   public String toString() {
     return this.name();
   }