feat: fields and features for dedicated server support

.envrc

@@ -0,0 +1 @@
+use nix

.github/workflows/build.yml

@@ -16,7 +16,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download dependencies
-        run: sudo apt update && sudo apt install -y build-essential libpng-dev
+        run: |
+          sudo apt update && sudo apt install -y build-essential libpng-dev protobuf-compiler
+          go install google.golang.org/protobuf/cmd/[email protected]
+          go install google.golang.org/grpc/cmd/[email protected]
 
       - name: Go Generate
         run: go generate -tags tools -x ./...
@@ -39,14 +42,18 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download dependencies
-        run: sudo apt update && sudo apt install -y build-essential libpng-dev
+        run: |
+          sudo apt update && sudo apt install -y build-essential libpng-dev protobuf-compiler
+          go install google.golang.org/protobuf/cmd/[email protected]
+          go install google.golang.org/grpc/cmd/[email protected]
 
       - name: Go Generate
         run: go generate -tags tools -x ./...
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
+          version: v1.49.0
           skip-pkg-cache: true
           skip-build-cache: true
           args: --timeout 5m
@@ -64,7 +71,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download dependencies
-        run: sudo apt update && sudo apt install -y build-essential libpng-dev
+        run: |
+          sudo apt update && sudo apt install -y build-essential libpng-dev protobuf-compiler
+          go install google.golang.org/protobuf/cmd/[email protected]
+          go install google.golang.org/grpc/cmd/[email protected]
 
       - name: Go Generate
         run: go generate -tags tools -x ./...

.github/workflows/release.yml

@@ -21,7 +21,10 @@ jobs:
           fetch-depth: 0
 
       - name: Download dependencies
-        run: sudo apt update && sudo apt install -y build-essential libpng-dev
+        run: |
+          sudo apt update && sudo apt install -y build-essential libpng-dev protobuf-compiler
+          go install google.golang.org/protobuf/cmd/[email protected]
+          go install google.golang.org/grpc/cmd/[email protected]
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3

Dockerfile

@@ -1,6 +1,8 @@
-FROM golang:1.18-alpine AS builder
+FROM golang:1.19-alpine3.18 AS builder
 
-RUN apk add --no-cache git build-base libpng-dev
+RUN apk add --no-cache git build-base libpng-dev protoc
+RUN go install google.golang.org/protobuf/cmd/[email protected]
+RUN go install google.golang.org/grpc/cmd/[email protected]
 
 WORKDIR $GOPATH/src/github.com/satisfactorymodding/smr-api/
 

README.md

@@ -49,6 +49,14 @@ Main configuration options:
 
 The config format can be seen in `config/config.go` (each dot means a new level of nesting).
 
+After startup requires the following minio commands to be executed:
+
+```shell
+mc alias set local http://localhost:9000 minio minio123
+mc admin user svcacct add local minio --access-key REPLACE_ME_KEY --secret-key REPLACE_ME_SECRET
+mc anonymous set public local/smr
+```
+
 ## Contributing
 
 Before contributing, please run the [linter](https://golangci-lint.run/) to ensure the code is clean and well-formed:

config.sample.json

@@ -27,7 +27,8 @@
     "key": "REPLACE_ME_KEY",
     "secret": "REPLACE_ME_SECRET",
     "endpoint": "http://localhost:9000",
-    "base_url": "http://localhost:9000"
+    "base_url": "http://localhost:9000",
+    "keypath": "%s/%s/%s"
   },
 
   "oauth": {
@@ -52,5 +53,9 @@
 
   "frontend": {
     "url": "http://localhost:4200"
+  },
+
+  "feature_flags": {
+    "allow_multi_target_upload": false
   }
 }

config/config.go

@@ -100,4 +100,6 @@ func initializeDefaults() {
 	viper.SetDefault("frontend.url", "")
 
 	viper.SetDefault("virustotal.key", "")
+
+	viper.SetDefault("feature_flags.allow_multi_target_upload", false)
 }

dataloader/loaders.go

@@ -109,7 +109,7 @@ func Middleware() func(handlerFunc echo.HandlerFunc) echo.HandlerFunc {
 
 						var entities []postgres.Version
 						reqCtx := c.Request().Context()
-						postgres.DBCtx(reqCtx).Preload("Arch").Where("approved = ? AND denied = ? AND mod_id IN ?", true, false, fetchIds).Order("created_at desc").Find(&entities)
+						postgres.DBCtx(reqCtx).Preload("Targets").Where("approved = ? AND denied = ? AND mod_id IN ?", true, false, fetchIds).Order("created_at desc").Find(&entities)
 
 						for _, entity := range entities {
 							byID[entity.ModID] = append(byID[entity.ModID], entity)
@@ -145,7 +145,7 @@ func Middleware() func(handlerFunc echo.HandlerFunc) echo.HandlerFunc {
 
 						var entities []postgres.Version
 						reqCtx := c.Request().Context()
-						postgres.DBCtx(reqCtx).Preload("Arch").Select(
+						postgres.DBCtx(reqCtx).Preload("Targets").Select(
 							"id",
 							"created_at",
 							"updated_at",

db/postgres/mod.go

@@ -26,7 +26,7 @@ func GetModByID(ctx context.Context, modID string) *Mod {
 
 func GetModByIDNoCache(ctx context.Context, modID string) *Mod {
 	var mod Mod
-	DBCtx(ctx).Preload("Tags").Preload("Versions.Arch").Find(&mod, "id = ?", modID)
+	DBCtx(ctx).Preload("Tags").Preload("Versions.Targets").Find(&mod, "id = ?", modID)
 
 	if mod.ID == "" {
 		return nil
@@ -44,7 +44,7 @@ func GetModByReference(ctx context.Context, modReference string) *Mod {
 	}
 
 	var mod Mod
-	DBCtx(ctx).Preload("Tags").Preload("Versions.Arch").Find(&mod, "mod_reference = ?", modReference)
+	DBCtx(ctx).Preload("Tags").Preload("Versions.Targets").Find(&mod, "mod_reference = ?", modReference)
 
 	if mod.ID == "" {
 		return nil
@@ -213,7 +213,7 @@ func NewModQuery(ctx context.Context, filter *models.ModFilter, unapproved bool,
 	}
 
 	query = query.Where("approved = ? AND denied = ?", !unapproved, false)
-	query = query.Preload("Tags").Preload("Versions.Arch")
+	query = query.Preload("Tags").Preload("Versions.Targets")
 	if filter != nil {
 		if filter.Search != nil && *filter.Search != "" {
 			cleanSearch := strings.ReplaceAll(strings.TrimSpace(*filter.Search), " ", " & ")
@@ -270,7 +270,7 @@ func GetModByIDOrReference(ctx context.Context, modIDOrReference string) *Mod {
 	}
 
 	var mod Mod
-	DBCtx(ctx).Preload("Tags").Preload("Versions.Arch").Find(&mod, "mod_reference = ? OR id = ?", modIDOrReference, modIDOrReference)
+	DBCtx(ctx).Preload("Tags").Preload("Versions.Targets").Find(&mod, "mod_reference = ? OR id = ?", modIDOrReference, modIDOrReference)
 
 	if mod.ID == "" {
 		return nil

db/postgres/postgres_types.go

@@ -87,13 +87,27 @@ type Version struct {
 	SMLVersion string `gorm:"type:varchar(16)"`
 	Version    string `gorm:"type:varchar(16)"`
 	ModID      string
-	Arch       []ModArch `gorm:"foreignKey:ModVersionID;preload:true"`
+	Targets    []VersionTarget `gorm:"foreignKey:VersionID"`
 	Hotness    uint
 	Downloads  uint
 	Denied     bool `gorm:"default:false;not null"`
 	Approved   bool `gorm:"default:false;not null"`
 }
 
+type TinyVersion struct {
+	Hash *string
+	Size *int64
+	SMRModel
+	SMLVersion   string              `gorm:"type:varchar(16)"`
+	Version      string              `gorm:"type:varchar(16)"`
+	Targets      []VersionTarget     `gorm:"foreignKey:VersionID;preload:true"`
+	Dependencies []VersionDependency `gorm:"foreignKey:VersionID"`
+}
+
+func (TinyVersion) TableName() string {
+	return "versions"
+}
+
 type Guide struct {
 	SMRModel
 	Name             string `gorm:"type:varchar(50)"`
@@ -120,7 +134,8 @@ type SMLVersion struct {
 	Stability           string `sql:"type:version_stability"`
 	Link                string
 	Changelog           string
-	Arch                []SMLArch `gorm:"foreignKey:SMLVersionID;preload:true"`
+	EngineVersion       string
+	Targets             []SMLVersionTarget `gorm:"foreignKey:VersionID"`
 	SatisfactoryVersion int
 }
 
@@ -179,26 +194,16 @@ type Compatibility struct {
 	Note  string
 }
 
-type ModArch struct {
-	ID           string `gorm:"primary_key;type:varchar(16)"`
-	ModVersionID string `gorm:"column:mod_version_arch_id"`
-	Platform     string
-	Key          string
-	Hash         string
-	Size         int64
-}
-
-func (ModArch) TableName() string {
-	return "mod_archs"
-}
-
-type SMLArch struct {
-	ID           string `gorm:"primary_key;type:varchar(14)"`
-	SMLVersionID string `gorm:"column:sml_version_arch_id"`
-	Platform     string
-	Link         string
+type VersionTarget struct {
+	VersionID  string `gorm:"primary_key;type:varchar(14)"`
+	TargetName string `gorm:"primary_key;type:varchar(16)"`
+	Key        string
+	Hash       string
+	Size       int64
 }
 
-func (SMLArch) TableName() string {
-	return "sml_archs"
+type SMLVersionTarget struct {
+	VersionID  string `gorm:"primary_key;type:varchar(14)"`
+	TargetName string `gorm:"primary_key;type:varchar(16)"`
+	Link       string
 }