Frontend redesign

.github/workflows/cicd.yml

@@ -45,7 +45,7 @@ jobs:
     steps:
       # <editor-fold desc="Prepare">
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Assume PRs are less than 50 commits
           fetch-depth: 50
@@ -106,9 +106,9 @@ jobs:
       # <editor-fold desc="Build Backend">
       - name: Set up JDK
         if: ${{ steps.vars.outputs.build_backend == 'true' }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: temurin
           cache: "maven"
 
@@ -127,9 +127,9 @@ jobs:
 
       - name: Set up Node
         if: ${{ steps.vars.outputs.build_frontend == 'true' }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
-          node-version: "22"
+          node-version: "24"
           cache: "pnpm"
           cache-dependency-path: "frontend/pnpm-lock.yaml"
 
@@ -181,7 +181,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker (frontend)
-        if: ${{ steps.vars.outputs.deploy == 'true' }}
+        if: ${{ steps.vars.outputs.build_frontend == 'true' && steps.vars.outputs.deploy == 'true' }}
         id: frontend-meta
         uses: docker/metadata-action@v5
         with:
@@ -191,7 +191,7 @@ jobs:
             type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push frontend Dockerfile
-        if: ${{ steps.vars.outputs.deploy == 'true' }}
+        if: ${{ steps.vars.outputs.build_frontend == 'true' && steps.vars.outputs.deploy == 'true' }}
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -203,7 +203,7 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Extract metadata (tags, labels) for Docker (backend)
-        if: ${{ steps.vars.outputs.deploy == 'true' }}
+        if: ${{ steps.vars.outputs.build_backend == 'true' && steps.vars.outputs.deploy == 'true' }}
         id: backend-meta
         uses: docker/metadata-action@v5
         with:
@@ -213,7 +213,7 @@ jobs:
             type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push backend Dockerfile
-        if: ${{ steps.vars.outputs.deploy == 'true' }}
+        if: ${{ steps.vars.outputs.build_backend == 'true' && steps.vars.outputs.deploy == 'true' }}
         uses: docker/build-push-action@v6
         with:
           context: .

.github/workflows/e2e.yml

@@ -27,17 +27,17 @@ jobs:
           access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
-          node-version: '22'
+          node-version: '24'
 
       - name: Set up pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8
+          version: 10
 
       - name: Get pnpm store directory
         id: pnpm-cache

backend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.6</version>
         <relativePath/>
     </parent>
 
@@ -26,23 +26,23 @@
         <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
 
         <!-- dependency management -->
-        <jdbi3-bom.version>3.49.5</jdbi3-bom.version>
+        <jdbi3-bom.version>3.49.6</jdbi3-bom.version>
         <configurate.version>4.2.0</configurate.version>
         <spring-cloud-aws.version>3.4.0</spring-cloud-aws.version>
 
         <!-- dependencies -->
-        <sentry.version>8.18.0</sentry.version>
-        <springdoc.version>2.8.9</springdoc.version>
+        <sentry.version>8.23.0</sentry.version>
+        <springdoc.version>2.8.13</springdoc.version>
         <jsitemapgenerator.version>4.5</jsitemapgenerator.version>
         <org-json.version>20250517</org-json.version>
-        <bucket4j.version>8.14.0</bucket4j.version>
-        <datafaker.version>2.4.4</datafaker.version>
-        <apache-commons-lang.version>3.18.0</apache-commons-lang.version>
+        <bucket4j.version>8.15.0</bucket4j.version>
+        <datafaker.version>2.5.1</datafaker.version>
+        <apache-commons-lang.version>3.19.0</apache-commons-lang.version>
         <jwt.version>4.5.0</jwt.version>
-        <jetbrains-annotations.version>26.0.2</jetbrains-annotations.version>
+        <jetbrains-annotations.version>26.0.2-1</jetbrains-annotations.version>
         <caffeine.version>3.2.2</caffeine.version>
         <jarscanner.version>1.0-SNAPSHOT</jarscanner.version>
-        <jgroups.version>5.4.8.Final</jgroups.version>
+        <jgroups.version>5.4.11.Final</jgroups.version>
         <jgroups-kube.version>2.0.2.Final</jgroups-kube.version>
         <totp.version>1.8.0</totp.version>
         <webp.version>0.1.6</webp.version>
@@ -54,11 +54,11 @@
 
         <!-- test -->
         <testcontainer.version>1.21.3</testcontainer.version>
-        <openapi-generator.version>7.14.0</openapi-generator.version>
+        <openapi-generator.version>7.16.0</openapi-generator.version>
         <argLine/>
 
         <!-- plugins -->
-        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
     </properties>
 
     <repositories>

backend/src/main/java/io/papermc/hangar/components/jobs/JobService.java

@@ -61,6 +61,10 @@ public void checkAndProcess() {
                 this.executorService.submit(this::process);
             }
         }
+        final long stuckJobs = this.jobsDAO.fixStuckJobs();
+        if (stuckJobs > 0) {
+            this.logger.warn("Fixed {} stuck jobs", stuckJobs);
+        }
     }
 
     public List<JobTable> getErroredJobs() {
@@ -141,7 +145,7 @@ private void processJob(final JobTable job) throws Exception {
                     this.jobsDAO.retryIn(job.getId(), OffsetDateTime.now().plus(scheduledTaskJob.getInterval(), ChronoUnit.MILLIS), null, null);
                 } catch (final Exception ex) {
                     // scheduled tasks get special error handling
-                    this.logger.debug("scheduled job failed to process: {} {}", ex.getMessage(), job, ex);
+                    this.logger.warn("scheduled job failed to process: {} {}", ex.getMessage(), job, ex);
                     final String error = "Encountered error when processing scheduled job\n" +
                         this.toJobString(job) +
                         "Exception: " + ex.getClass().getName() + "\n" +

backend/src/main/java/io/papermc/hangar/components/jobs/db/JobsDAO.java

@@ -42,4 +42,11 @@ public interface JobsDAO {
 
     @SqlQuery("SELECT * FROM jobs WHERE id = :jobId")
     JobTable getJob(long jobId);
+
+    @SqlUpdate("""
+        UPDATE jobs
+        SET state = 'not_started'
+        WHERE state = 'started' AND (last_updated < now() - INTERVAL '15 minutes');
+        """)
+    long fixStuckJobs();
 }

backend/src/main/java/io/papermc/hangar/config/SwaggerConfig.java

@@ -248,7 +248,7 @@ OpenApiWebMvcResource openApiResource(final ObjectFactory<OpenAPIService> openAP
                 operationParser,
                 springDocConfigProperties, springDocProviders,
                 new SpringDocCustomizers(Optional.of(groupedOpenApi.getOpenApiCustomizers()), Optional.of(groupedOpenApi.getOperationCustomizers()),
-                    Optional.of(groupedOpenApi.getRouterOperationCustomizers()), Optional.of(groupedOpenApi.getOpenApiMethodFilters()))
+                    Optional.of(groupedOpenApi.getRouterOperationCustomizers()), Optional.of(groupedOpenApi.getOpenApiMethodFilters()), Optional.empty(), Optional.empty())
 
             )).orElseThrow(RuntimeException::new);
 

backend/src/main/java/io/papermc/hangar/controller/internal/admin/AdminController.java

@@ -160,9 +160,10 @@ public ArrayNode getStats(@RequestParam(required = false) @DateTimeFormat(iso =
     @PermissionRequired(NamedPermission.VIEW_HEALTH)
     @GetMapping(path = "/health", produces = MediaType.APPLICATION_JSON_VALUE)
     public HealthReport getHealthReport() {
-        final List<UnhealthyProject> staleProjects = this.healthService.getStaleProjects();
-        final List<MissingFileCheck> missingFiles = this.healthService.getVersionsWithMissingFiles();
-        final List<UnhealthyProject> nonPublicProjects = this.healthService.getNonPublicProjects();
+        // TODO make health report less slow
+        final List<UnhealthyProject> staleProjects = List.of(); // this.healthService.getStaleProjects();
+        final List<MissingFileCheck> missingFiles = List.of(); //this.healthService.getVersionsWithMissingFiles();
+        final List<UnhealthyProject> nonPublicProjects = List.of(); //this.healthService.getNonPublicProjects();
         final List<JobTable> erroredJobs = this.jobService.getErroredJobs();
         return new HealthReport(staleProjects, missingFiles, nonPublicProjects, erroredJobs);
     }

backend/src/main/java/io/papermc/hangar/service/internal/versions/plugindata/handler/BukkitFileTypeHandler.java

@@ -0,0 +1,67 @@
+package io.papermc.hangar.service.internal.versions.plugindata.handler;
+
+import io.papermc.hangar.model.api.project.version.PluginDependency;
+import io.papermc.hangar.model.common.Platform;
+import io.papermc.hangar.service.internal.versions.plugindata.handler.BukkitFileTypeHandler.BukkitFileData;
+import java.io.BufferedReader;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
+import org.spongepowered.configurate.ConfigurateException;
+import org.spongepowered.configurate.objectmapping.ConfigSerializable;
+import org.spongepowered.configurate.objectmapping.meta.Setting;
+import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BukkitFileTypeHandler extends FileTypeHandler<BukkitFileData> {
+
+    protected BukkitFileTypeHandler() {
+        super("plugin.yml", Platform.PAPER);
+    }
+
+    @Override
+    public BukkitFileData getData(final BufferedReader reader) throws ConfigurateException {
+        return YamlConfigurationLoader.builder().buildAndLoadString(reader.lines().collect(Collectors.joining("\n"))).get(BukkitFileData.class);
+    }
+
+    @ConfigSerializable
+    public static class BukkitFileData extends FileTypeHandler.FileData {
+
+        @Setting("depend")
+        private List<String> hardDepends;
+        @Setting("softdepend")
+        private List<String> softDepends;
+        @Setting("api-version")
+        private String apiVersion;
+
+        @Override
+        public @NotNull SortedSet<String> getPlatformDependencies() {
+            final SortedSet<String> platformVersions = new TreeSet<>();
+            if (this.apiVersion != null) {
+                platformVersions.add(this.apiVersion);
+            }
+            return platformVersions;
+        }
+
+        @Override
+        protected @NotNull Set<PluginDependency> createPluginDependencies() {
+            final Set<PluginDependency> dependencies = new HashSet<>();
+            if (this.hardDepends != null) {
+                for (final String hardDepend : this.hardDepends) {
+                    dependencies.add(PluginDependency.of(hardDepend, true, Platform.PAPER));
+                }
+            }
+            if (this.softDepends != null) {
+                for (final String softDepend : this.softDepends) {
+                    dependencies.add(PluginDependency.of(softDepend, false, Platform.PAPER));
+                }
+            }
+            return dependencies;
+        }
+    }
+}

backend/src/main/java/io/papermc/hangar/service/internal/versions/plugindata/handler/PaperFileTypeHandler.java

@@ -6,6 +6,7 @@
 import java.io.BufferedReader;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -21,7 +22,7 @@
 public class PaperFileTypeHandler extends FileTypeHandler<PaperFileData> {
 
     protected PaperFileTypeHandler() {
-        super("plugin.yml", Platform.PAPER);
+        super("paper-plugin.yml", Platform.PAPER);
     }
 
     @Override
@@ -30,12 +31,10 @@ public PaperFileData getData(final BufferedReader reader) throws ConfigurateExce
     }
 
     @ConfigSerializable
-    public static class PaperFileData extends FileTypeHandler.FileData {
+    public static class PaperFileData extends FileData {
 
-        @Setting("depend")
-        private List<String> hardDepends;
-        @Setting("softdepend")
-        private List<String> softDepends;
+        @Setting("dependencies")
+        private Map<String, Map<String, Dependency>> dependencies;
         @Setting("api-version")
         private String apiVersion;
 
@@ -51,17 +50,19 @@ public static class PaperFileData extends FileTypeHandler.FileData {
         @Override
         protected @NotNull Set<PluginDependency> createPluginDependencies() {
             final Set<PluginDependency> dependencies = new HashSet<>();
-            if (this.hardDepends != null) {
-                for (final String hardDepend : this.hardDepends) {
-                    dependencies.add(PluginDependency.of(hardDepend, true, Platform.PAPER));
-                }
-            }
-            if (this.softDepends != null) {
-                for (final String softDepend : this.softDepends) {
-                    dependencies.add(PluginDependency.of(softDepend, false, Platform.PAPER));
+            if (this.dependencies != null) {
+                for (final Map.Entry<String, Map<String, Dependency>> entry : this.dependencies.entrySet()) {
+                    for (final Map.Entry<String, Dependency> dependencyEntry : entry.getValue().entrySet()) {
+                        final String dependencyName = dependencyEntry.getKey();
+                        final boolean required = dependencyEntry.getValue().required;
+                        dependencies.add(PluginDependency.of(dependencyName, required, Platform.PAPER));
+                    }
                 }
             }
             return dependencies;
         }
+
+        @ConfigSerializable
+        record Dependency(boolean required) {}
     }
 }

backend/src/main/java/io/papermc/hangar/service/internal/versions/plugindata/handler/VelocityFileTypeHandler.java

@@ -4,7 +4,6 @@
 import io.papermc.hangar.model.common.Platform;
 import io.papermc.hangar.service.internal.versions.plugindata.handler.VelocityFileTypeHandler.VelocityFileData;
 import java.io.BufferedReader;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.jetbrains.annotations.NotNull;
@@ -36,23 +35,6 @@ public static class VelocityFileData extends FileTypeHandler.FileData {
         }
 
         @ConfigSerializable
-        static class Dependency {
-
-            private String id;
-            private boolean optional;
-
-            @Override
-            public boolean equals(final Object o) {
-                if (this == o) return true;
-                if (o == null || this.getClass() != o.getClass()) return false;
-                final Dependency that = (Dependency) o;
-                return this.optional == that.optional && this.id.equals(that.id);
-            }
-
-            @Override
-            public int hashCode() {
-                return Objects.hash(this.id, this.optional);
-            }
-        }
+        record Dependency(String id, boolean optional) {}
     }
 }