Modpacks v2

backend/cloudbuild.yml

@@ -22,4 +22,4 @@ substitutions:
   _TAG: latest
 
 options:
-  defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET
+  defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

backend/src/main/java/net/modtale/config/db/ProjectDependencySchemaMigration.java

@@ -0,0 +1,140 @@
+package net.modtale.config.db;
+
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.ReplaceOptions;
+import java.util.List;
+import java.util.UUID;
+import net.modtale.model.project.ProjectDependency;
+import org.bson.Document;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProjectDependencySchemaMigration {
+
+    private static final Logger logger = LoggerFactory.getLogger(ProjectDependencySchemaMigration.class);
+
+    private final MongoTemplate mongoTemplate;
+
+    public ProjectDependencySchemaMigration(MongoTemplate mongoTemplate) {
+        this.mongoTemplate = mongoTemplate;
+    }
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void migrateLegacyDependencyDocuments() {
+        MongoCollection<Document> projects = mongoTemplate.getCollection("projects");
+        int changedProjects = 0;
+        int changedDependencies = 0;
+
+        for (Document project : projects.find(Filters.or(
+                Filters.exists("versions.dependencies.modId"),
+                Filters.exists("versions.dependencies.id", false),
+                Filters.exists("modIds")
+        ))) {
+            int projectChanges = normalizeProject(project);
+            if (projectChanges == 0) {
+                continue;
+            }
+
+            projects.replaceOne(
+                    Filters.eq("_id", project.get("_id")),
+                    project,
+                    new ReplaceOptions().upsert(false)
+            );
+            changedProjects++;
+            changedDependencies += projectChanges;
+        }
+
+        if (changedProjects > 0) {
+            logger.info("Migrated {} legacy dependency references across {} projects.", changedDependencies, changedProjects);
+        }
+    }
+
+    private int normalizeProject(Document project) {
+        int changes = normalizeProjectDependencyIndex(project);
+        Object rawVersions = project.get("versions");
+        if (!(rawVersions instanceof List<?> versions)) {
+            return changes;
+        }
+
+        for (Object versionObj : versions) {
+            if (!(versionObj instanceof Document version)) {
+                continue;
+            }
+            Object rawDependencies = version.get("dependencies");
+            if (!(rawDependencies instanceof List<?> dependencies)) {
+                continue;
+            }
+            for (Object dependencyObj : dependencies) {
+                if (dependencyObj instanceof Document dependency && normalizeDependency(dependency)) {
+                    changes++;
+                }
+            }
+        }
+        return changes;
+    }
+
+    private int normalizeProjectDependencyIndex(Document project) {
+        if (!project.containsKey("modIds")) {
+            return 0;
+        }
+        Object legacyModIds = project.get("modIds");
+        if (!project.containsKey("childProjectIds") && legacyModIds instanceof List<?>) {
+            project.put("childProjectIds", legacyModIds);
+        }
+        project.remove("modIds");
+        return 1;
+    }
+
+    private boolean normalizeDependency(Document dependency) {
+        if (!dependency.containsKey("modId")
+                && dependency.containsKey("projectId")
+                && dependency.containsKey("dependencyType")
+                && dependency.containsKey("id")) {
+            return false;
+        }
+
+        Object projectId = firstPresent(dependency, "projectId", "modId");
+        Object projectTitle = firstPresent(dependency, "projectTitle", "modTitle");
+        dependency.putIfAbsent("id", UUID.randomUUID().toString());
+        if (projectId != null) {
+            dependency.put("projectId", projectId);
+        }
+        if (projectTitle != null) {
+            dependency.put("projectTitle", projectTitle);
+        }
+        dependency.putIfAbsent("source", ProjectDependency.Source.MODTALE.name());
+        dependency.putIfAbsent("hytaleProjectConfirmed", false);
+        dependency.put("dependencyType", inferDependencyType(dependency));
+
+        dependency.remove("modId");
+        dependency.remove("modTitle");
+        dependency.remove("isOptional");
+        dependency.remove("isEmbedded");
+        return true;
+    }
+
+    private Object firstPresent(Document document, String primary, String fallback) {
+        Object primaryValue = document.get(primary);
+        return primaryValue != null ? primaryValue : document.get(fallback);
+    }
+
+    private String inferDependencyType(Document dependency) {
+        if (Boolean.TRUE.equals(dependency.getBoolean("isEmbedded"))) {
+            return ProjectDependency.DependencyType.EMBEDDED.name();
+        }
+        if (Boolean.TRUE.equals(dependency.getBoolean("isOptional"))) {
+            return ProjectDependency.DependencyType.OPTIONAL.name();
+        }
+        Object existingType = dependency.get("dependencyType");
+        if (existingType != null) {
+            return existingType.toString();
+        }
+        return ProjectDependency.DependencyType.REQUIRED.name();
+    }
+}

backend/src/main/java/net/modtale/config/properties/AppCurseForgeProperties.java

@@ -0,0 +1,13 @@
+package net.modtale.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "app.curseforge")
+public record AppCurseForgeProperties(
+        String apiKey,
+        long hytaleGameId
+) {
+    public boolean isConfigured() {
+        return apiKey != null && !apiKey.isBlank() && hytaleGameId > 0;
+    }
+}

backend/src/main/java/net/modtale/controller/project/ExternalProjectController.java

@@ -0,0 +1,36 @@
+package net.modtale.controller.project;
+
+import net.modtale.model.dto.project.ExternalProjectReferenceDTO;
+import net.modtale.model.project.ProjectDependency;
+import net.modtale.service.project.version.ExternalProjectReferenceService;
+import org.springframework.http.CacheControl;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.concurrent.TimeUnit;
+
+@RestController
+@RequestMapping("/api/v1")
+public class ExternalProjectController {
+
+    private final ExternalProjectReferenceService externalProjectReferenceService;
+
+    public ExternalProjectController(ExternalProjectReferenceService externalProjectReferenceService) {
+        this.externalProjectReferenceService = externalProjectReferenceService;
+    }
+
+    @GetMapping("/projects/external/resolve")
+    @PreAuthorize("@apiSecurity.hasAnyPerm('PROJECT_READ', authentication)")
+    public ResponseEntity<ExternalProjectReferenceDTO> resolveExternalProject(
+            @RequestParam String url,
+            @RequestParam(required = false) ProjectDependency.Source source
+    ) {
+        return ResponseEntity.ok()
+                .cacheControl(CacheControl.maxAge(10, TimeUnit.MINUTES).cachePublic())
+                .body(externalProjectReferenceService.resolve(url, source));
+    }
+}

backend/src/main/java/net/modtale/controller/project/VersionController.java

@@ -12,6 +12,7 @@
 import net.modtale.model.dto.response.project.DownloadUrlResponse;
 import net.modtale.model.dto.response.project.VersionDependenciesView;
 import net.modtale.model.user.User;
+import net.modtale.model.project.ModpackTarget;
 import net.modtale.service.project.version.VersionApplicationService;
 import net.modtale.service.project.version.VersionDownloadPayload;
 import net.modtale.service.user.account.AccountService;
@@ -136,12 +137,14 @@ public ResponseEntity<DownloadUrlResponse> getDownloadUrl(
             @PathVariable String id,
             @PathVariable String version,
             @RequestParam(value = "gameVersion", required = false) String gameVersion,
+            @RequestParam(value = "target", defaultValue = "UNIVERSAL") ModpackTarget target,
             Authentication authentication
     ) {
         return ResponseEntity.ok(versionApplicationService.createDownloadUrl(
                 id,
                 version,
                 gameVersion,
+                target,
                 accountService.getCurrentUser(authentication)
         ));
     }

backend/src/main/java/net/modtale/mapper/ProjectMapper.java

@@ -249,7 +249,6 @@ public static ProjectDTO toDTO(Project project, boolean isSummary, String curren
         if (!isSummary) {
             dto.setAbout(project.getAbout());
             dto.setChildProjectIds(project.getChildProjectIds());
-            dto.setModIds(project.getModIds());
 
             dto.setProjectRoles(project.getProjectRoles());
             dto.setTeamMembers(project.getTeamMembers());
@@ -426,11 +425,21 @@ private static AdminVerificationQueueScanDTO toVerificationQueueScanDTO(ScanResu
     public static ProjectDependencyDTO toDependencyDTO(ProjectDependency dependency) {
         if (dependency == null) return null;
         return new ProjectDependencyDTO(
-                dependency.getModId(),
-                dependency.getModTitle(),
+                dependency.getId(),
+                dependency.getProjectId(),
+                dependency.getProjectTitle(),
                 dependency.getVersionNumber(),
+                dependency.getDependencyType(),
+                dependency.getEnvironment(),
+                dependency.getSource(),
+                dependency.getExternalId(),
+                dependency.getExternalUrl(),
+                dependency.getExternalFileUrl(),
+                dependency.getExternalFileName(),
+                dependency.getCachedFileUrl(),
+                dependency.isHytaleProjectConfirmed(),
                 dependency.getIcon(),
-                dependency.getTitle() != null ? dependency.getTitle() : dependency.getModTitle(),
+                dependency.getTitle() != null ? dependency.getTitle() : dependency.getProjectTitle(),
                 dependency.getClassification(),
                 dependency.getSlug(),
                 dependency.isOptional(),

backend/src/main/java/net/modtale/model/dto/project/ExternalProjectReferenceDTO.java

@@ -0,0 +1,35 @@
+package net.modtale.model.dto.project;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.List;
+import java.util.Map;
+import net.modtale.model.project.ProjectDependency;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record ExternalProjectReferenceDTO(
+        ProjectDependency.Source source,
+        String externalId,
+        String title,
+        String versionNumber,
+        String externalUrl,
+        String iconUrl,
+        String summary,
+        boolean hytaleProjectConfirmed,
+        Boolean distributionAllowed,
+        List<ExternalFileDTO> files
+) {
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record ExternalFileDTO(
+            String id,
+            String displayName,
+            String fileName,
+            String versionNumber,
+            String releaseType,
+            String downloadUrl,
+            Long fileSize,
+            Map<String, String> hashes,
+            List<String> gameVersions,
+            Integer fileStatus,
+            Boolean available
+    ) {}
+}

backend/src/main/java/net/modtale/model/dto/project/ManifestDependencySuggestion.java

@@ -8,7 +8,6 @@ public class ManifestDependencySuggestion {
     private String versionNumber;
     private boolean optional;
     private int confidence;
-    private String dependencyEntry;
 
     public ManifestDependencySuggestion() {}
 
@@ -20,7 +19,6 @@ public ManifestDependencySuggestion(String manifestKey, String requestedVersion,
         this.versionNumber = versionNumber;
         this.optional = optional;
         this.confidence = confidence;
-        this.dependencyEntry = projectId + ":" + versionNumber + (optional ? ":optional" : "");
     }
 
     public String getManifestKey() { return manifestKey; }
@@ -43,7 +41,4 @@ public ManifestDependencySuggestion(String manifestKey, String requestedVersion,
 
     public int getConfidence() { return confidence; }
     public void setConfidence(int confidence) { this.confidence = confidence; }
-
-    public String getDependencyEntry() { return dependencyEntry; }
-    public void setDependencyEntry(String dependencyEntry) { this.dependencyEntry = dependencyEntry; }
 }

backend/src/main/java/net/modtale/model/dto/project/ProjectDTO.java

@@ -35,7 +35,6 @@ public class ProjectDTO {
     private Map<String, String> links;
     private List<String> types;
     private List<String> childProjectIds;
-    private List<String> modIds;
     private boolean allowModpacks;
     private boolean allowComments;
     private boolean hmWikiEnabled;
@@ -107,8 +106,6 @@ public class ProjectDTO {
     public void setTypes(List<String> types) { this.types = types; }
     public List<String> getChildProjectIds() { return childProjectIds; }
     public void setChildProjectIds(List<String> childProjectIds) { this.childProjectIds = childProjectIds; }
-    public List<String> getModIds() { return modIds; }
-    public void setModIds(List<String> modIds) { this.modIds = modIds; }
     public boolean isAllowModpacks() { return allowModpacks; }
     public void setAllowModpacks(boolean allowModpacks) { this.allowModpacks = allowModpacks; }
     public boolean isAllowComments() { return allowComments; }

backend/src/main/java/net/modtale/model/dto/project/ProjectDependencyDTO.java

@@ -2,12 +2,23 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import net.modtale.model.project.ProjectClassification;
+import net.modtale.model.project.ProjectDependency;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record ProjectDependencyDTO(
+        String id,
         String projectId,
         String projectTitle,
         String versionNumber,
+        ProjectDependency.DependencyType dependencyType,
+        ProjectDependency.Environment environment,
+        ProjectDependency.Source source,
+        String externalId,
+        String externalUrl,
+        String externalFileUrl,
+        String externalFileName,
+        String cachedFileUrl,
+        boolean hytaleProjectConfirmed,
         String icon,
         String title,
         ProjectClassification classification,

backend/src/main/java/net/modtale/model/dto/request/project/CreateVersionRequest.java

@@ -13,7 +13,7 @@ public class CreateVersionRequest {
 
     private List<@NotBlank(message = "Game version entries cannot be blank.") String> gameVersions;
     private MultipartFile file;
-    private List<@NotBlank(message = "Dependency entries cannot be blank.") String> modIds;
+    private List<DependencyReferenceRequest> dependencies;
     private List<@NotBlank(message = "Incompatible project entries cannot be blank.") String> incompatibleProjectIds;
 
     @Size(max = 50000, message = "Version changelogs cannot exceed 50,000 characters.")
@@ -46,12 +46,12 @@ public void setFile(MultipartFile file) {
         this.file = file;
     }
 
-    public List<String> getModIds() {
-        return modIds;
+    public List<DependencyReferenceRequest> getDependencies() {
+        return dependencies;
     }
 
-    public void setModIds(List<String> modIds) {
-        this.modIds = modIds;
+    public void setDependencies(List<DependencyReferenceRequest> dependencies) {
+        this.dependencies = dependencies;
     }
 
     public List<String> getIncompatibleProjectIds() {