Compare commits

..

28 Commits

Author SHA1 Message Date
8a96378c64 Merge branch 'feature/config-presets' into develop 2026-03-27 17:44:49 +01:00
f2580b6de0 fix: nullable server id in activity log and fix preset logging 2026-03-26 22:48:59 +01:00
f23f276ee5 fix: preset logging 2026-03-26 22:32:24 +01:00
180555c903 feat: config presets 2026-03-26 21:45:15 +01:00
efc6b72838 bump version
Some checks failed
Release and Deploy / build (push) Failing after 3m41s
Release and Deploy / deploy (push) Has been skipped
2026-03-23 22:14:55 +01:00
0e04da031b fix: resolve empty configs logging 2026-03-23 22:13:19 +01:00
908adf4468 fix: stream only new logs back to client after starting server 2026-03-23 21:31:32 +01:00
6c1e9b236e fix: build errors 2026-03-23 21:18:02 +01:00
f563d52396 Merge branch 'feature/sync-server-name-with-config' into develop 2026-03-23 21:17:09 +01:00
a490a73392 fix: revert debug mode 2026-03-23 21:16:59 +01:00
0ef47ef241 Merge branch 'feature/server-log-endpoint-and-ws-streaming' into develop 2026-03-23 21:13:12 +01:00
ea2e871c9b Merge branch 'feature/activity-log-system' into develop 2026-03-23 21:02:35 +01:00
c2c6543068 Merge branch 'feature/containers' into develop 2026-03-23 21:02:26 +01:00
14aa8a84e5 feat: add logging to existing services 2026-03-22 13:54:43 +01:00
e96b8bca12 feat: add activity logs 2026-03-22 13:52:15 +01:00
a6f67dd652 fix: use ring buffer for log reading 2026-03-22 13:39:31 +01:00
e637b5e649 feat: add server log endpoint and streaming 2026-03-22 13:38:00 +01:00
85c5874bc7 update container port mapping 2026-03-22 13:23:35 +01:00
4441524447 fix acc server container restarting 2026-03-22 13:23:35 +01:00
c03234d339 update server app path to host's 2026-03-22 13:23:35 +01:00
d4b16d80f3 resolve server creation issues 2026-03-22 13:23:35 +01:00
9172f0256f add docker specifics 2026-03-22 13:23:35 +01:00
beb9b479df add platform interface according to env 2026-03-22 13:23:35 +01:00
4aa67db3fd add docker specific columns to server table 2026-03-22 13:23:35 +01:00
1100072245 feat: sync server name when updating all configs 2026-03-22 13:22:46 +01:00
49dfa38475 feat: sync server name with config 2026-03-22 13:19:43 +01:00
747adc77a5 version bump
Some checks failed
Release and Deploy / deploy (push) Has been skipped
Release and Deploy / build (push) Failing after 6m7s
2026-03-22 12:24:54 +01:00
c9a32e8889 feat: batch update config endpoint 2026-03-22 12:16:40 +01:00
43 changed files with 1572 additions and 71 deletions

View File

@@ -13,7 +13,7 @@ services:
DB_NAME: /data/db/acc.db DB_NAME: /data/db/acc.db
STEAMCMD_LINUX_PATH: /usr/games/steamcmd STEAMCMD_LINUX_PATH: /usr/games/steamcmd
PORT_POOL_MIN: "9600" PORT_POOL_MIN: "9600"
PORT_POOL_MAX: "9700" PORT_POOL_MAX: "9699"
ACC_IMAGE: acc-wine:latest ACC_IMAGE: acc-wine:latest
ACC_SERVERS_PATH: /data/servers ACC_SERVERS_PATH: /data/servers
ACC_SERVERS_HOST_PATH: /opt/acc-servers ACC_SERVERS_HOST_PATH: /opt/acc-servers

View File

@@ -1,6 +1,5 @@
# ACC Server container: Wine + accServer.exe # ACC Server container: Wine + accServer.exe
# Game files are mounted read-only from the shared acc-game volume. # Game files are bind-mounted from the host at /acc/game.
# Per-server config files are mounted read-write from the manager's config volume.
FROM debian:bookworm-slim FROM debian:bookworm-slim
# Install Wine, Xvfb (headless display for Wine), and minimal runtime deps. # Install Wine, Xvfb (headless display for Wine), and minimal runtime deps.
@@ -12,13 +11,17 @@ RUN dpkg --add-architecture i386 && \
wine64 \ wine64 \
xvfb \ xvfb \
ca-certificates \ ca-certificates \
tcpdump \
&& \ && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Create a non-root user for running the server. RUN mkdir -p /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix
RUN useradd -ms /bin/bash accserver
WORKDIR /home/accserver WORKDIR /root
ENV WINEARCH=win64
ENV WINEPREFIX=/root/.wine
ENV WINEDEBUG=-all
# Copy entrypoint script. # Copy entrypoint script.
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
@@ -27,13 +30,6 @@ RUN chmod +x /entrypoint.sh
# Bind-mounted by DockerRuntime.Create: per-server game install (rw) # Bind-mounted by DockerRuntime.Create: per-server game install (rw)
VOLUME ["/acc/game"] VOLUME ["/acc/game"]
# Default server port — overridden at runtime via SERVER_PORT env var.
ENV SERVER_PORT=9600 ENV SERVER_PORT=9600
ENV WINEDEBUG=-all
ENV DISPLAY=:99
EXPOSE ${SERVER_PORT}/tcp
EXPOSE ${SERVER_PORT}/udp
USER accserver
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]

View File

@@ -1,7 +1,15 @@
#!/bin/bash #!/bin/bash
set -e set -e
Xvfb :99 -screen 0 1024x768x16 & # Use a display number derived from the server port to avoid conflicts
# between containers (each server gets its own unique display).
DISPLAY_NUM=$((SERVER_PORT % 1000 + 100))
export DISPLAY=:${DISPLAY_NUM}
# Clean up any stale X lock from a previous container run.
rm -f /tmp/.X${DISPLAY_NUM}-lock /tmp/.X11-unix/X${DISPLAY_NUM} 2>/dev/null || true
Xvfb ${DISPLAY} -screen 0 1024x768x16 -nolisten tcp &
XVFB_PID=$! XVFB_PID=$!
cleanup() { cleanup() {
@@ -10,7 +18,9 @@ cleanup() {
} }
trap cleanup SIGTERM SIGINT trap cleanup SIGTERM SIGINT
mkdir -p /acc/game/log
echo "Starting ACC server on port ${SERVER_PORT}..." echo "Starting ACC server on port ${SERVER_PORT}..."
exec wine /acc/game/accServer.exe \ cd /acc/game
-port "${SERVER_PORT}" exec wine /acc/game/accServer.exe

View File

@@ -34,6 +34,10 @@ func Init(di *dig.Container, app *fiber.App) {
WebSocket: groups.Group("/ws"), WebSocket: groups.Group("/ws"),
Leaderboard: serverIdGroup.Group("/leaderboard"), Leaderboard: serverIdGroup.Group("/leaderboard"),
Steam: groups.Group("/steam"), Steam: groups.Group("/steam"),
ActivityLog: serverIdGroup.Group("/activity-log"),
Groups: groups,
Log: serverIdGroup.Group("/log"),
Presets: groups.Group("/presets"),
} }
accessKeyMiddleware := middleware.NewAccessKeyMiddleware() accessKeyMiddleware := middleware.NewAccessKeyMiddleware()

View File

@@ -0,0 +1,48 @@
package controller
import (
"acc-server-manager/local/middleware"
"acc-server-manager/local/model"
"acc-server-manager/local/service"
"acc-server-manager/local/utl/common"
"acc-server-manager/local/utl/error_handler"
"github.com/gofiber/fiber/v2"
)
type ActivityLogController struct {
service *service.ActivityLogService
errorHandler *error_handler.ControllerErrorHandler
}
func NewActivityLogController(as *service.ActivityLogService, routeGroups *common.RouteGroups, auth *middleware.AuthMiddleware) *ActivityLogController {
ac := &ActivityLogController{
service: as,
errorHandler: error_handler.NewControllerErrorHandler(),
}
// Global activity log: GET /activity-log (admin use)
routeGroups.Groups.Group("/activity-log").Use(auth.Authenticate).Get("/", ac.GetAllLogs)
return ac
}
// GetAllLogs returns activity logs across all servers (admin).
//
// @Summary Return all activity logs
// @Tags ActivityLog
// @Success 200 {array} model.ActivityLog
// @Router /activity-log [get]
func (ac *ActivityLogController) GetAllLogs(c *fiber.Ctx) error {
var filter model.ActivityLogFilter
if err := common.ParseQueryFilter(c, &filter); err != nil {
return ac.errorHandler.HandleValidationError(c, err, "query_filter")
}
result, err := ac.service.GetAll(c.UserContext(), &filter)
if err != nil {
return ac.errorHandler.HandleServiceError(c, err)
}
return c.JSON(result)
}

View File

@@ -2,6 +2,7 @@ package controller
import ( import (
"acc-server-manager/local/middleware" "acc-server-manager/local/middleware"
"acc-server-manager/local/model"
"acc-server-manager/local/service" "acc-server-manager/local/service"
"acc-server-manager/local/utl/common" "acc-server-manager/local/utl/common"
"acc-server-manager/local/utl/error_handler" "acc-server-manager/local/utl/error_handler"
@@ -34,6 +35,7 @@ func NewConfigController(as *service.ConfigService, routeGroups *common.RouteGro
configGroup := routeGroups.Config configGroup := routeGroups.Config
configGroup.Use(auth.Authenticate) configGroup.Use(auth.Authenticate)
configGroup.Patch("/", ac.UpdateAllConfigs)
configGroup.Put("/:file", ac.UpdateConfig) configGroup.Put("/:file", ac.UpdateConfig)
configGroup.Get("/:file", ac.GetConfig) configGroup.Get("/:file", ac.GetConfig)
configGroup.Get("/", ac.GetConfigs) configGroup.Get("/", ac.GetConfigs)
@@ -41,6 +43,54 @@ func NewConfigController(as *service.ConfigService, routeGroups *common.RouteGro
return ac return ac
} }
// updateAllConfigs updates all configuration files
//
// @Summary Bulk update all server configuration files
// @Description Update multiple ACC server configuration files in one request. Null or omitted sections are skipped.
// @Tags Server Configuration
// @Accept json
// @Produce json
// @Param id path string true "Server ID (UUID format)"
// @Param restart query bool false "Restart the server after update"
// @Param override query bool false "Override instead of merging with existing config"
// @Param content body model.ConfigurationsUpdateRequest true "Configuration sections to update (null sections are skipped)"
// @Success 200 {array} model.Config "List of updated config audit records"
// @Failure 400 {object} error_handler.ErrorResponse "Invalid request or JSON format"
// @Failure 401 {object} error_handler.ErrorResponse "Unauthorized"
// @Failure 403 {object} error_handler.ErrorResponse "Insufficient permissions"
// @Failure 404 {object} error_handler.ErrorResponse "Server not found"
// @Failure 500 {object} error_handler.ErrorResponse "Internal server error"
// @Security BearerAuth
// @Router /server/{id}/config [patch]
func (ac *ConfigController) UpdateAllConfigs(c *fiber.Ctx) error {
restart := c.QueryBool("restart")
serverID := c.Params("id")
if _, err := uuid.Parse(serverID); err != nil {
return ac.errorHandler.HandleUUIDError(c, "server ID")
}
c.Locals("serverId", serverID)
var req model.ConfigurationsUpdateRequest
if err := c.BodyParser(&req); err != nil {
return ac.errorHandler.HandleParsingError(c, err)
}
configs, err := ac.service.UpdateAllConfigs(c, &req)
if err != nil {
return ac.errorHandler.HandleServiceError(c, err)
}
if restart {
if _, err := ac.apiService.ServiceControlRestartServer(c); err != nil {
logging.ErrorWithContext("CONFIG_RESTART", "Failed to restart server after bulk config update: %v", err)
}
}
return c.JSON(configs)
}
// updateConfig returns Config // updateConfig returns Config
// //
// @Summary Update server configuration file // @Summary Update server configuration file

View File

@@ -0,0 +1,246 @@
package controller
import (
"acc-server-manager/local/middleware"
"acc-server-manager/local/model"
"acc-server-manager/local/service"
"acc-server-manager/local/utl/common"
"acc-server-manager/local/utl/error_handler"
"acc-server-manager/local/utl/logging"
"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
)
type ConfigPresetController struct {
service *service.ConfigPresetService
apiService *service.ServiceControlService
errorHandler *error_handler.ControllerErrorHandler
}
// NewConfigPresetController initializes ConfigPresetController.
func NewConfigPresetController(s *service.ConfigPresetService, apiService *service.ServiceControlService, routeGroups *common.RouteGroups, auth *middleware.AuthMiddleware) *ConfigPresetController {
c := &ConfigPresetController{
service: s,
apiService: apiService,
errorHandler: error_handler.NewControllerErrorHandler(),
}
presetRoutes := routeGroups.Presets
presetRoutes.Use(auth.Authenticate)
presetRoutes.Get("/", auth.HasPermission(model.PresetView), c.ListPresets)
presetRoutes.Post("/", auth.HasPermission(model.PresetCreate), c.CreatePreset)
presetRoutes.Get("/:presetId", auth.HasPermission(model.PresetView), c.GetPreset)
presetRoutes.Put("/:presetId", auth.HasPermission(model.PresetUpdate), c.UpdatePreset)
presetRoutes.Delete("/:presetId", auth.HasPermission(model.PresetDelete), c.DeletePreset)
configRoutes := routeGroups.Config
configRoutes.Post("/presets/:presetId/apply", auth.HasPermission(model.ConfigUpdate), c.ApplyPreset)
return c
}
// ListPresets returns all config presets.
//
// @Summary List config presets
// @Description Get a list of all saved configuration presets
// @Tags Config Presets
// @Accept json
// @Produce json
// @Param name query string false "Filter by preset name (partial match)"
// @Success 200 {array} model.ConfigPreset "List of presets"
// @Failure 401 {object} error_handler.ErrorResponse "Unauthorized"
// @Failure 403 {object} error_handler.ErrorResponse "Insufficient permissions"
// @Failure 500 {object} error_handler.ErrorResponse "Internal server error"
// @Security BearerAuth
// @Router /presets [get]
func (c *ConfigPresetController) ListPresets(ctx *fiber.Ctx) error {
var filter model.ConfigPresetFilter
if err := common.ParseQueryFilter(ctx, &filter); err != nil {
return c.errorHandler.HandleParsingError(ctx, err)
}
presets, err := c.service.ListPresets(ctx.UserContext(), &filter)
if err != nil {
return c.errorHandler.HandleServiceError(ctx, err)
}
return ctx.JSON(presets)
}
// GetPreset returns a single config preset by ID.
//
// @Summary Get config preset
// @Description Retrieve a single configuration preset by ID
// @Tags Config Presets
// @Accept json
// @Produce json
// @Param presetId path string true "Preset ID (UUID format)"
// @Success 200 {object} model.ConfigPreset "Preset"
// @Failure 400 {object} error_handler.ErrorResponse "Invalid preset ID"
// @Failure 401 {object} error_handler.ErrorResponse "Unauthorized"
// @Failure 403 {object} error_handler.ErrorResponse "Insufficient permissions"
// @Failure 404 {object} error_handler.ErrorResponse "Preset not found"
// @Failure 500 {object} error_handler.ErrorResponse "Internal server error"
// @Security BearerAuth
// @Router /presets/{presetId} [get]
func (c *ConfigPresetController) GetPreset(ctx *fiber.Ctx) error {
id, err := uuid.Parse(ctx.Params("presetId"))
if err != nil {
return c.errorHandler.HandleUUIDError(ctx, "preset ID")
}
preset, err := c.service.GetPreset(ctx.UserContext(), id)
if err != nil {
return c.errorHandler.HandleServiceError(ctx, err)
}
return ctx.JSON(preset)
}
// CreatePreset creates a new config preset.
//
// @Summary Create config preset
// @Description Save a new configuration preset with one or more ACC config sections
// @Tags Config Presets
// @Accept json
// @Produce json
// @Param content body model.ConfigPresetCreateRequest true "Preset data"
// @Success 201 {object} model.ConfigPreset "Created preset"
// @Failure 400 {object} error_handler.ErrorResponse "Invalid request"
// @Failure 401 {object} error_handler.ErrorResponse "Unauthorized"
// @Failure 403 {object} error_handler.ErrorResponse "Insufficient permissions"
// @Failure 500 {object} error_handler.ErrorResponse "Internal server error"
// @Security BearerAuth
// @Router /presets [post]
func (c *ConfigPresetController) CreatePreset(ctx *fiber.Ctx) error {
var req model.ConfigPresetCreateRequest
if err := ctx.BodyParser(&req); err != nil {
return c.errorHandler.HandleParsingError(ctx, err)
}
actorID, _ := ctx.Locals("userID").(string)
actorUsername, _ := ctx.Locals("actorUsername").(string)
if actorUsername == "" {
actorUsername = "system"
}
preset, err := c.service.CreatePreset(ctx.UserContext(), &req, actorID, actorUsername)
if err != nil {
return c.errorHandler.HandleServiceError(ctx, err)
}
return ctx.Status(fiber.StatusCreated).JSON(preset)
}
// UpdatePreset updates an existing config preset.
//
// @Summary Update config preset
// @Description Update name, description, or any config sections of an existing preset
// @Tags Config Presets
// @Accept json
// @Produce json
// @Param presetId path string true "Preset ID (UUID format)"
// @Param content body model.ConfigPresetUpdateRequest true "Fields to update (omit to keep existing)"
// @Success 200 {object} model.ConfigPreset "Updated preset"
// @Failure 400 {object} error_handler.ErrorResponse "Invalid request or preset ID"
// @Failure 401 {object} error_handler.ErrorResponse "Unauthorized"
// @Failure 403 {object} error_handler.ErrorResponse "Insufficient permissions"
// @Failure 404 {object} error_handler.ErrorResponse "Preset not found"
// @Failure 500 {object} error_handler.ErrorResponse "Internal server error"
// @Security BearerAuth
// @Router /presets/{presetId} [put]
func (c *ConfigPresetController) UpdatePreset(ctx *fiber.Ctx) error {
id, err := uuid.Parse(ctx.Params("presetId"))
if err != nil {
return c.errorHandler.HandleUUIDError(ctx, "preset ID")
}
var req model.ConfigPresetUpdateRequest
if err := ctx.BodyParser(&req); err != nil {
return c.errorHandler.HandleParsingError(ctx, err)
}
preset, err := c.service.UpdatePreset(ctx.UserContext(), id, &req)
if err != nil {
return c.errorHandler.HandleServiceError(ctx, err)
}
return ctx.JSON(preset)
}
// DeletePreset deletes a config preset.
//
// @Summary Delete config preset
// @Description Permanently delete a configuration preset
// @Tags Config Presets
// @Accept json
// @Produce json
// @Param presetId path string true "Preset ID (UUID format)"
// @Success 204 "No Content"
// @Failure 400 {object} error_handler.ErrorResponse "Invalid preset ID"
// @Failure 401 {object} error_handler.ErrorResponse "Unauthorized"
// @Failure 403 {object} error_handler.ErrorResponse "Insufficient permissions"
// @Failure 500 {object} error_handler.ErrorResponse "Internal server error"
// @Security BearerAuth
// @Router /presets/{presetId} [delete]
func (c *ConfigPresetController) DeletePreset(ctx *fiber.Ctx) error {
id, err := uuid.Parse(ctx.Params("presetId"))
if err != nil {
return c.errorHandler.HandleUUIDError(ctx, "preset ID")
}
if err := c.service.DeletePreset(ctx.UserContext(), id); err != nil {
return c.errorHandler.HandleServiceError(ctx, err)
}
return ctx.SendStatus(fiber.StatusNoContent)
}
// ApplyPreset applies a saved preset to a server's config files.
//
// @Summary Apply config preset to server
// @Description Apply a saved configuration preset to an ACC server, writing only the sections stored in the preset
// @Tags Server Configuration
// @Accept json
// @Produce json
// @Param id path string true "Server ID (UUID format)"
// @Param presetId path string true "Preset ID (UUID format)"
// @Param restart query bool false "Restart the server after applying the preset"
// @Success 200 {array} model.Config "List of updated config audit records"
// @Failure 400 {object} error_handler.ErrorResponse "Invalid server or preset ID"
// @Failure 401 {object} error_handler.ErrorResponse "Unauthorized"
// @Failure 403 {object} error_handler.ErrorResponse "Insufficient permissions"
// @Failure 404 {object} error_handler.ErrorResponse "Server or preset not found"
// @Failure 500 {object} error_handler.ErrorResponse "Internal server error"
// @Security BearerAuth
// @Router /server/{id}/config/presets/{presetId}/apply [post]
func (c *ConfigPresetController) ApplyPreset(ctx *fiber.Ctx) error {
restart := ctx.QueryBool("restart")
serverID := ctx.Params("id")
if _, err := uuid.Parse(serverID); err != nil {
return c.errorHandler.HandleUUIDError(ctx, "server ID")
}
ctx.Locals("serverId", serverID)
presetID, err := uuid.Parse(ctx.Params("presetId"))
if err != nil {
return c.errorHandler.HandleUUIDError(ctx, "preset ID")
}
actorID, _ := ctx.Locals("userID").(string)
actorUsername, _ := ctx.Locals("actorUsername").(string)
if actorUsername == "" {
actorUsername = "system"
}
configs, err := c.service.ApplyPreset(ctx.UserContext(), serverID, presetID, actorID, actorUsername)
if err != nil {
return c.errorHandler.HandleServiceError(ctx, err)
}
if restart {
if _, err := c.apiService.ServiceControlRestartServer(ctx); err != nil {
logging.ErrorWithContext("PRESET_APPLY_RESTART", "Failed to restart server after preset apply: %v", err)
}
}
return ctx.JSON(configs)
}

View File

@@ -35,6 +35,11 @@ func InitializeControllers(c *dig.Container) {
logging.Panic("unable to initialize config controller") logging.Panic("unable to initialize config controller")
} }
err = c.Invoke(NewConfigPresetController)
if err != nil {
logging.Panic("unable to initialize config preset controller")
}
err = c.Invoke(NewServerController) err = c.Invoke(NewServerController)
if err != nil { if err != nil {
logging.Panic("unable to initialize server controller") logging.Panic("unable to initialize server controller")
@@ -69,4 +74,14 @@ func InitializeControllers(c *dig.Container) {
if err != nil { if err != nil {
logging.Panic("unable to initialize steam controller") logging.Panic("unable to initialize steam controller")
} }
err = c.Invoke(NewActivityLogController)
if err != nil {
logging.Panic("unable to initialize activity log controller")
}
err = c.Invoke(NewLogController)
if err != nil {
logging.Panic("unable to initialize log controller")
}
} }

View File

@@ -11,6 +11,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
) )
type LeaderboardController struct { type LeaderboardController struct {
service *service.LeaderboardService service *service.LeaderboardService
errorHandler *error_handler.ControllerErrorHandler errorHandler *error_handler.ControllerErrorHandler
@@ -60,7 +61,14 @@ func (lc *LeaderboardController) Update(c *fiber.Ctx) error {
return lc.errorHandler.HandleParsingError(c, err) return lc.errorHandler.HandleParsingError(c, err)
} }
data, err := lc.service.Update(c.UserContext(), serverID, &input) userInfo, _ := c.Locals("userInfo").(*middleware.CachedUserInfo)
actorID, actorUsername := "", "system"
if userInfo != nil {
actorID = userInfo.UserID
actorUsername = userInfo.Username
}
data, err := lc.service.Update(c.UserContext(), serverID, &input, actorID, actorUsername)
if err != nil { if err != nil {
return lc.errorHandler.HandleServiceError(c, err) return lc.errorHandler.HandleServiceError(c, err)
} }

62
local/controller/log.go Normal file
View File

@@ -0,0 +1,62 @@
package controller
import (
"acc-server-manager/local/middleware"
"acc-server-manager/local/model"
"acc-server-manager/local/service"
"acc-server-manager/local/utl/common"
"acc-server-manager/local/utl/error_handler"
"strconv"
"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
)
type LogController struct {
service *service.ServerService
errorHandler *error_handler.ControllerErrorHandler
}
func NewLogController(ss *service.ServerService, routeGroups *common.RouteGroups, auth *middleware.AuthMiddleware) *LogController {
lc := &LogController{
service: ss,
errorHandler: error_handler.NewControllerErrorHandler(),
}
logRoutes := routeGroups.Log
logRoutes.Use(auth.Authenticate)
logRoutes.Get("/", auth.HasPermission(model.ServerView), lc.GetLogLines)
return lc
}
// GetLogLines godoc
// @Summary Get last N lines of server log
// @Tags Server
// @Param id path string true "Server ID"
// @Param lines query int false "Number of lines to return (default 100)"
// @Success 200 {object} object{lines=[]string}
// @Security BearerAuth
// @Router /server/{id}/log [get]
func (lc *LogController) GetLogLines(c *fiber.Ctx) error {
serverIDStr := c.Params("id")
serverID, err := uuid.Parse(serverIDStr)
if err != nil {
return lc.errorHandler.HandleUUIDError(c, "server ID")
}
n, _ := strconv.Atoi(c.Query("lines", "100"))
if n <= 0 {
n = 100
}
if n > 10000 {
n = 10000
}
lines, err := lc.service.GetLastLogLines(c, serverID, n)
if err != nil {
return lc.errorHandler.HandleServiceError(c, err)
}
return c.JSON(fiber.Map{"lines": lines})
}

View File

@@ -29,6 +29,7 @@ func NewServiceControlController(as *service.ServiceControlService, routeGroups
} }
serviceRoutes := routeGroups.Server.Group("/:id/service") serviceRoutes := routeGroups.Server.Group("/:id/service")
serviceRoutes.Use(auth.Authenticate)
serviceRoutes.Get("/:service", ac.getStatus) serviceRoutes.Get("/:service", ac.getStatus)
serviceRoutes.Post("/start", ac.startServer) serviceRoutes.Post("/start", ac.startServer)
serviceRoutes.Post("/stop", ac.stopServer) serviceRoutes.Post("/stop", ac.stopServer)

View File

@@ -115,6 +115,7 @@ func (m *AuthMiddleware) AuthenticateWithHandler(jwtHandler *jwt.JWTHandler, isO
if os.Getenv("TESTING_ENV") == "true" { if os.Getenv("TESTING_ENV") == "true" {
userInfo := CachedUserInfo{UserID: uuid.New().String(), Username: "test@example.com", RoleName: "Admin", Permissions: make(map[string]bool), CachedAt: time.Now()} userInfo := CachedUserInfo{UserID: uuid.New().String(), Username: "test@example.com", RoleName: "Admin", Permissions: make(map[string]bool), CachedAt: time.Now()}
ctx.Locals("userID", userInfo.UserID) ctx.Locals("userID", userInfo.UserID)
ctx.Locals("actorUsername", userInfo.Username)
ctx.Locals("userInfo", userInfo) ctx.Locals("userInfo", userInfo)
ctx.Locals("authTime", time.Now()) ctx.Locals("authTime", time.Now())
} else { } else {
@@ -127,6 +128,7 @@ func (m *AuthMiddleware) AuthenticateWithHandler(jwtHandler *jwt.JWTHandler, isO
} }
ctx.Locals("userID", claims.UserID) ctx.Locals("userID", claims.UserID)
ctx.Locals("actorUsername", userInfo.Username)
ctx.Locals("userInfo", userInfo) ctx.Locals("userInfo", userInfo)
ctx.Locals("authTime", time.Now()) ctx.Locals("authTime", time.Now())
} }

View File

@@ -0,0 +1,33 @@
package migrations
import (
"acc-server-manager/local/utl/logging"
"fmt"
"gorm.io/gorm"
)
func RunAddActivityLogMigration(db *gorm.DB) error {
if err := db.AutoMigrate(&MigrationRecord{}); err != nil {
return fmt.Errorf("failed to ensure migration_records table: %v", err)
}
var record MigrationRecord
if err := db.Where("migration_name = ?", "006_add_activity_log").First(&record).Error; err == nil {
logging.Info("Activity log migration already applied, skipping")
return nil
}
record = MigrationRecord{
MigrationName: "006_add_activity_log",
AppliedAt: "datetime('now')",
Success: true,
Notes: "Added ActivityLog table via GORM AutoMigrate",
}
if err := db.Create(&record).Error; err != nil {
return fmt.Errorf("failed to record migration 006: %v", err)
}
logging.Info("Activity log migration recorded")
return nil
}

View File

@@ -0,0 +1,51 @@
package migrations
import (
"acc-server-manager/local/utl/logging"
"fmt"
"time"
"gorm.io/gorm"
)
type ConfigPresetMigration struct {
ID uint `gorm:"primaryKey"`
Name string `gorm:"not null"`
Description string
Configuration string `gorm:"type:text"`
AssistRules string `gorm:"type:text"`
Event string `gorm:"type:text"`
EventRules string `gorm:"type:text"`
Settings string `gorm:"type:text"`
CreatedAt string
UpdatedAt string
}
func (ConfigPresetMigration) TableName() string {
return "config_presets"
}
func RunAddConfigPresetsMigration(db *gorm.DB) error {
if err := db.AutoMigrate(&MigrationRecord{}); err != nil {
return fmt.Errorf("failed to ensure migration_records table: %v", err)
}
var record MigrationRecord
if err := db.Where("migration_name = ?", "007_add_config_presets").First(&record).Error; err == nil {
logging.Info("Config presets migration already applied, skipping")
return nil
}
record = MigrationRecord{
MigrationName: "007_add_config_presets",
AppliedAt: time.Now().UTC().Format(time.RFC3339),
Success: true,
Notes: "Added ConfigPreset table via GORM AutoMigrate",
}
if err := db.Create(&record).Error; err != nil {
return fmt.Errorf("failed to record migration 007: %v", err)
}
logging.Info("Config presets migration recorded")
return nil
}

View File

@@ -0,0 +1,84 @@
package model
import (
"time"
"github.com/google/uuid"
"gorm.io/gorm"
)
type ActionType string
const (
ActionConfigUpdate ActionType = "config_update"
ActionServerStart ActionType = "server_start"
ActionServerStop ActionType = "server_stop"
ActionServerRestart ActionType = "server_restart"
ActionLeaderboardUpdate ActionType = "leaderboard_update"
ActionPresetCreate ActionType = "preset_create"
ActionPresetApply ActionType = "preset_apply"
)
type ActivityLog struct {
ID uuid.UUID `json:"id" gorm:"type:uuid;primary_key;"`
ServerID *uuid.UUID `json:"serverId" gorm:"type:uuid;index"`
Server *Server `json:"server,omitempty" gorm:"foreignKey:ServerID"`
UserID string `json:"userId" gorm:"not null"`
Username string `json:"username" gorm:"not null"`
Action ActionType `json:"action" gorm:"not null"`
Details string `json:"details" gorm:"type:text"`
CreatedAt time.Time `json:"createdAt"`
}
func (a *ActivityLog) BeforeCreate(tx *gorm.DB) error {
if a.ID == uuid.Nil {
a.ID = uuid.New()
}
if a.CreatedAt.IsZero() {
a.CreatedAt = time.Now().UTC()
}
return nil
}
type ActivityLogFilter struct {
BaseFilter
DateRangeFilter
UserID string `query:"user_id"`
Action ActionType `query:"action"`
ServerID string `query:"server_id"`
}
func (f *ActivityLogFilter) ApplyFilter(query *gorm.DB) *gorm.DB {
if f.ServerID != "" {
if serverUUID, err := uuid.Parse(f.ServerID); err == nil {
query = query.Where("server_id = ?", serverUUID)
}
}
if f.UserID != "" {
query = query.Where("user_id = ?", f.UserID)
}
if f.Action != "" {
query = query.Where("action = ?", f.Action)
}
timeZero := time.Time{}
if f.StartDate != timeZero {
query = query.Where("created_at >= ?", f.StartDate)
}
if f.EndDate != timeZero {
query = query.Where("created_at <= ?", f.EndDate)
}
return query
}
func (f *ActivityLogFilter) GetSorting() (field string, desc bool) {
if f.SortBy == "" {
return "created_at", true
}
return f.SortBy, f.SortDesc
}
type LastActivityInfo struct {
UpdatedAt time.Time `json:"updatedAt"`
Username string `json:"username"`
Action ActionType `json:"action"`
}

View File

@@ -40,6 +40,14 @@ type Configurations struct {
Settings ServerSettings `json:"settings"` Settings ServerSettings `json:"settings"`
} }
type ConfigurationsUpdateRequest struct {
Configuration *map[string]interface{} `json:"configuration"`
AssistRules *map[string]interface{} `json:"assistRules"`
Event *map[string]interface{} `json:"event"`
EventRules *map[string]interface{} `json:"eventRules"`
Settings *map[string]interface{} `json:"settings"`
}
type ServerSettings struct { type ServerSettings struct {
ServerName string `json:"serverName"` ServerName string `json:"serverName"`
AdminPassword string `json:"adminPassword"` AdminPassword string `json:"adminPassword"`

View File

@@ -0,0 +1,48 @@
package model
import (
"time"
"github.com/google/uuid"
"gorm.io/gorm"
)
type ConfigPreset struct {
ID uuid.UUID `json:"id" gorm:"type:uuid;primary_key;"`
Name string `json:"name" gorm:"not null"`
Description string `json:"description"`
Configuration string `json:"configuration" gorm:"type:text"`
AssistRules string `json:"assistRules" gorm:"type:text"`
Event string `json:"event" gorm:"type:text"`
EventRules string `json:"eventRules" gorm:"type:text"`
Settings string `json:"settings" gorm:"type:text"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
func (p *ConfigPreset) BeforeCreate(tx *gorm.DB) error {
if p.ID == uuid.Nil {
p.ID = uuid.New()
}
return nil
}
type ConfigPresetCreateRequest struct {
Name string `json:"name"`
Description string `json:"description"`
Configuration *map[string]interface{} `json:"configuration"`
AssistRules *map[string]interface{} `json:"assistRules"`
Event *map[string]interface{} `json:"event"`
EventRules *map[string]interface{} `json:"eventRules"`
Settings *map[string]interface{} `json:"settings"`
}
type ConfigPresetUpdateRequest struct {
Name *string `json:"name"`
Description *string `json:"description"`
Configuration *map[string]interface{} `json:"configuration"`
AssistRules *map[string]interface{} `json:"assistRules"`
Event *map[string]interface{} `json:"event"`
EventRules *map[string]interface{} `json:"eventRules"`
Settings *map[string]interface{} `json:"settings"`
}

View File

@@ -30,6 +30,18 @@ type ConfigFilter struct {
ChangedAt time.Time `query:"changed_at" time_format:"2006-01-02T15:04:05Z07:00"` ChangedAt time.Time `query:"changed_at" time_format:"2006-01-02T15:04:05Z07:00"`
} }
type ConfigPresetFilter struct {
BaseFilter
Name string `query:"name"`
}
func (f *ConfigPresetFilter) ApplyFilter(query *gorm.DB) *gorm.DB {
if f.Name != "" {
query = query.Where("name LIKE ?", "%"+f.Name+"%")
}
return query
}
type ServiceControlFilter struct { type ServiceControlFilter struct {
BaseFilter BaseFilter
ServiceControl string `query:"serviceControl"` ServiceControl string `query:"serviceControl"`

View File

@@ -24,6 +24,11 @@ const (
MembershipCreate = "membership.create" MembershipCreate = "membership.create"
MembershipView = "membership.view" MembershipView = "membership.view"
MembershipEdit = "membership.edit" MembershipEdit = "membership.edit"
PresetView = "preset.view"
PresetCreate = "preset.create"
PresetUpdate = "preset.update"
PresetDelete = "preset.delete"
) )
func AllPermissions() []string { func AllPermissions() []string {
@@ -47,5 +52,9 @@ func AllPermissions() []string {
MembershipCreate, MembershipCreate,
MembershipView, MembershipView,
MembershipEdit, MembershipEdit,
PresetView,
PresetCreate,
PresetUpdate,
PresetDelete,
} }
} }

View File

@@ -35,18 +35,19 @@ func (s *Server) ToServerAPI() *ServerAPI {
} }
type Server struct { type Server struct {
ID uuid.UUID `gorm:"type:uuid;primary_key;" json:"id"` ID uuid.UUID `gorm:"type:uuid;primary_key;" json:"id"`
Name string `gorm:"not null" json:"name"` Name string `gorm:"not null" json:"name"`
Status ServiceStatus `json:"status" gorm:"-"` Status ServiceStatus `json:"status" gorm:"-"`
IP string `gorm:"not null" json:"-"` IP string `gorm:"not null" json:"-"`
Port int `gorm:"not null" json:"-"` Port int `gorm:"not null" json:"-"`
Path string `gorm:"not null" json:"path"` Path string `gorm:"not null" json:"path"`
ServiceName string `gorm:"not null" json:"serviceName"` ServiceName string `gorm:"not null" json:"serviceName"`
Platform string `gorm:"not null;default:'windows'" json:"platform"` Platform string `gorm:"not null;default:'windows'" json:"platform"`
ContainerID string `gorm:"default:''" json:"-"` ContainerID string `gorm:"default:''" json:"-"`
State *ServerState `gorm:"-" json:"state"` State *ServerState `gorm:"-" json:"state"`
DateCreated time.Time `json:"dateCreated"` LastActivity *LastActivityInfo `gorm:"-" json:"lastActivity,omitempty"`
FromSteamCMD bool `gorm:"not null; default:true" json:"-"` DateCreated time.Time `json:"dateCreated"`
FromSteamCMD bool `gorm:"not null; default:true" json:"-"`
} }
type PlayerState struct { type PlayerState struct {

View File

@@ -33,6 +33,7 @@ const (
MessageTypeSteamOutput WebSocketMessageType = "steam_output" MessageTypeSteamOutput WebSocketMessageType = "steam_output"
MessageTypeError WebSocketMessageType = "error" MessageTypeError WebSocketMessageType = "error"
MessageTypeComplete WebSocketMessageType = "complete" MessageTypeComplete WebSocketMessageType = "complete"
MessageTypeLogLine WebSocketMessageType = "log_line"
) )
type WebSocketMessage struct { type WebSocketMessage struct {
@@ -65,6 +66,10 @@ type CompleteMessage struct {
Message string `json:"message"` Message string `json:"message"`
} }
type LogLineMessage struct {
Line string `json:"line"`
}
func GetStepDescription(step ServerCreationStep) string { func GetStepDescription(step ServerCreationStep) string {
descriptions := map[ServerCreationStep]string{ descriptions := map[ServerCreationStep]string{
StepValidation: "Validating server configuration", StepValidation: "Validating server configuration",

View File

@@ -25,4 +25,5 @@ type FirewallManager interface {
type LogStreamer interface { type LogStreamer interface {
Start(ctx context.Context, server *model.Server, handleLine func(string)) error Start(ctx context.Context, server *model.Server, handleLine func(string)) error
Stop(serverID uuid.UUID) Stop(serverID uuid.UUID)
GetLastLines(ctx context.Context, server *model.Server, n int) ([]string, error)
} }

View File

@@ -0,0 +1,96 @@
package repository
import (
"acc-server-manager/local/model"
"context"
"fmt"
"time"
"github.com/google/uuid"
"gorm.io/gorm"
)
type ActivityLogRepository struct {
*BaseRepository[model.ActivityLog, model.ActivityLogFilter]
}
func NewActivityLogRepository(db *gorm.DB) *ActivityLogRepository {
return &ActivityLogRepository{
BaseRepository: NewBaseRepository[model.ActivityLog, model.ActivityLogFilter](db, model.ActivityLog{}),
}
}
func (r *ActivityLogRepository) Insert(ctx context.Context, entry *model.ActivityLog) error {
return r.BaseRepository.Insert(ctx, entry)
}
func (r *ActivityLogRepository) GetAll(ctx context.Context, filter *model.ActivityLogFilter) (*[]model.ActivityLog, error) {
result := &[]model.ActivityLog{}
query := r.BaseRepository.db.WithContext(ctx).
Model(&model.ActivityLog{}).
Preload("Server")
query = filter.ApplyFilter(query)
offset, limit := filter.Pagination()
query = query.Offset(offset).Limit(limit)
field, desc := filter.GetSorting()
if desc {
query = query.Order(field + " DESC")
} else {
query = query.Order(field)
}
if err := query.Find(result).Error; err != nil {
return nil, fmt.Errorf("error getting activity logs: %w", err)
}
return result, nil
}
type lastActivityRow struct {
ServerID string `gorm:"column:server_id"`
CreatedAt time.Time `gorm:"column:created_at"`
Username string `gorm:"column:username"`
Action model.ActionType `gorm:"column:action"`
}
// GetLastActivityByServerIDs returns the most recent activity entry per server.
// Uses a single GROUP BY query with MAX(created_at); SQLite selects the other
// columns from the row that holds the max value — documented SQLite behaviour.
func (r *ActivityLogRepository) GetLastActivityByServerIDs(ctx context.Context, serverIDs []uuid.UUID) (map[uuid.UUID]*model.LastActivityInfo, error) {
out := make(map[uuid.UUID]*model.LastActivityInfo)
if len(serverIDs) == 0 {
return out, nil
}
// Convert to string slice so the IN clause works with SQLite UUID strings.
ids := make([]string, len(serverIDs))
for i, id := range serverIDs {
ids[i] = id.String()
}
var rows []lastActivityRow
err := r.BaseRepository.db.WithContext(ctx).
Model(&model.ActivityLog{}).
Select("server_id, MAX(created_at) as created_at, username, action").
Where("server_id IN ?", ids).
Group("server_id").
Scan(&rows).Error
if err != nil {
return nil, err
}
for _, row := range rows {
serverUUID, err := uuid.Parse(row.ServerID)
if err != nil {
continue
}
out[serverUUID] = &model.LastActivityInfo{
UpdatedAt: row.CreatedAt,
Username: row.Username,
Action: row.Action,
}
}
return out, nil
}

View File

@@ -0,0 +1,17 @@
package repository
import (
"acc-server-manager/local/model"
"gorm.io/gorm"
)
type ConfigPresetRepository struct {
*BaseRepository[model.ConfigPreset, model.ConfigPresetFilter]
}
func NewConfigPresetRepository(db *gorm.DB) *ConfigPresetRepository {
return &ConfigPresetRepository{
BaseRepository: NewBaseRepository[model.ConfigPreset, model.ConfigPresetFilter](db, model.ConfigPreset{}),
}
}

View File

@@ -20,6 +20,8 @@ func InitializeRepositories(c *dig.Container) {
c.Provide(NewSteamCredentialsRepository) c.Provide(NewSteamCredentialsRepository)
c.Provide(NewMembershipRepository) c.Provide(NewMembershipRepository)
c.Provide(NewLeaderboardRepository) c.Provide(NewLeaderboardRepository)
c.Provide(NewActivityLogRepository)
c.Provide(NewConfigPresetRepository)
if err := c.Provide(func() *model.Steam2FAManager { if err := c.Provide(func() *model.Steam2FAManager {
manager := model.NewSteam2FAManager() manager := model.NewSteam2FAManager()

View File

@@ -0,0 +1,65 @@
package service
import (
"acc-server-manager/local/model"
"acc-server-manager/local/repository"
"acc-server-manager/local/utl/logging"
"context"
"encoding/json"
"fmt"
)
type ActivityLogService struct {
repo *repository.ActivityLogRepository
}
func NewActivityLogService(repo *repository.ActivityLogRepository) *ActivityLogService {
return &ActivityLogService{repo: repo}
}
// Log persists an activity log entry. Errors are logged but not returned so
// callers can treat this as fire-and-forget.
func (s *ActivityLogService) Log(ctx context.Context, entry *model.ActivityLog) error {
if err := s.repo.Insert(ctx, entry); err != nil {
logging.Error("Failed to insert activity log: %v", err)
return err
}
return nil
}
func (s *ActivityLogService) GetAll(ctx context.Context, filter *model.ActivityLogFilter) (*[]model.ActivityLog, error) {
return s.repo.GetAll(ctx, filter)
}
// BuildConfigDetails produces a JSON string summarising which top-level keys
// changed between oldJSON and newJSON.
func BuildConfigDetails(file string, oldJSON, newJSON []byte) string {
var oldMap, newMap map[string]interface{}
if err := json.Unmarshal(oldJSON, &oldMap); err != nil {
oldMap = map[string]interface{}{}
}
if err := json.Unmarshal(newJSON, &newMap); err != nil {
newMap = map[string]interface{}{}
}
var changedKeys []string
for key, newVal := range newMap {
oldVal, exists := oldMap[key]
if !exists {
changedKeys = append(changedKeys, key)
continue
}
oldBytes, _ := json.Marshal(oldVal)
newBytes, _ := json.Marshal(newVal)
if string(oldBytes) != string(newBytes) {
changedKeys = append(changedKeys, key)
}
}
if len(changedKeys) == 0 {
return ""
}
keysJSON, _ := json.Marshal(changedKeys)
return fmt.Sprintf(`{"file":%q,"changed_keys":%s}`, file, string(keysJSON))
}

View File

@@ -68,14 +68,16 @@ type ConfigService struct {
repository *repository.ConfigRepository repository *repository.ConfigRepository
serverRepository *repository.ServerRepository serverRepository *repository.ServerRepository
serverService *ServerService serverService *ServerService
activityLog *ActivityLogService
configCache *model.ServerConfigCache configCache *model.ServerConfigCache
} }
func NewConfigService(repository *repository.ConfigRepository, serverRepository *repository.ServerRepository) *ConfigService { func NewConfigService(repository *repository.ConfigRepository, serverRepository *repository.ServerRepository, activityLog *ActivityLogService) *ConfigService {
logging.Debug("Initializing ConfigService with 5m expiration and 1s throttle") logging.Debug("Initializing ConfigService with 5m expiration and 1s throttle")
return &ConfigService{ return &ConfigService{
repository: repository, repository: repository,
serverRepository: serverRepository, serverRepository: serverRepository,
activityLog: activityLog,
configCache: model.NewServerConfigCache(model.CacheConfig{ configCache: model.NewServerConfigCache(model.CacheConfig{
ExpirationTime: 5 * time.Minute, ExpirationTime: 5 * time.Minute,
ThrottleTime: 1 * time.Second, ThrottleTime: 1 * time.Second,
@@ -91,12 +93,104 @@ func (as *ConfigService) SetServerService(serverService *ServerService) {
// context.Context: Application context // context.Context: Application context
// Returns: // Returns:
// string: Application version // string: Application version
func (as *ConfigService) UpdateAllConfigs(ctx *fiber.Ctx, req *model.ConfigurationsUpdateRequest) ([]*model.Config, error) {
serverID := ctx.Locals("serverId").(string)
override := ctx.QueryBool("override", false)
serverUUID, err := uuid.Parse(serverID)
if err != nil {
logging.Error("Invalid server ID format: %v", err)
return nil, fmt.Errorf("invalid server ID format")
}
server, err := as.serverRepository.GetByID(ctx.UserContext(), serverUUID)
if err != nil {
logging.Error("Server not found")
return nil, fmt.Errorf("server not found")
}
type configEntry struct {
fileName string
body *map[string]interface{}
}
entries := []configEntry{
{ConfigurationJson, req.Configuration},
{AssistRulesJson, req.AssistRules},
{EventJson, req.Event},
{EventRulesJson, req.EventRules},
{SettingsJson, req.Settings},
}
actorID, _ := ctx.Locals("userID").(string)
actorUsername, _ := ctx.Locals("actorUsername").(string)
if actorUsername == "" {
actorUsername = "system"
}
var results []*model.Config
for _, entry := range entries {
if entry.body == nil {
continue
}
oldDataUTF8, newData, err := as.updateConfigFiles(ctx.UserContext(), server, entry.fileName, entry.body, override)
if err != nil {
return nil, err
}
if entry.fileName == SettingsJson {
if nameVal, ok := (*entry.body)["serverName"]; ok {
if nameStr, ok := nameVal.(string); ok && nameStr != "" && nameStr != server.Name {
server.Name = nameStr
if err := as.serverRepository.Update(ctx.UserContext(), server); err != nil {
logging.Error("Failed to update server name in DB: %v", err)
}
}
}
}
result := as.repository.UpdateConfig(ctx.UserContext(), &model.Config{
ServerID: serverUUID,
ConfigFile: entry.fileName,
OldConfig: string(oldDataUTF8),
NewConfig: string(newData),
ChangedAt: time.Now(),
})
results = append(results, result)
if as.activityLog != nil {
if details := BuildConfigDetails(entry.fileName, oldDataUTF8, newData); details != "" {
go func(details string) {
_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
ServerID: &serverUUID,
UserID: actorID,
Username: actorUsername,
Action: model.ActionConfigUpdate,
Details: details,
})
}(details)
}
}
}
if len(results) > 0 {
as.configCache.InvalidateServerCache(serverID)
as.serverService.StartAccServerRuntime(server)
}
return results, nil
}
func (as *ConfigService) UpdateConfig(ctx *fiber.Ctx, body *map[string]interface{}) (*model.Config, error) { func (as *ConfigService) UpdateConfig(ctx *fiber.Ctx, body *map[string]interface{}) (*model.Config, error) {
serverID := ctx.Locals("serverId").(string) serverID := ctx.Locals("serverId").(string)
configFile := ctx.Params("file") configFile := ctx.Params("file")
override := ctx.QueryBool("override", false) override := ctx.QueryBool("override", false)
return as.updateConfigInternal(ctx.UserContext(), serverID, configFile, body, override) actorID, _ := ctx.Locals("userID").(string)
actorUsername, _ := ctx.Locals("actorUsername").(string)
if actorUsername == "" {
actorUsername = "system"
}
return as.updateConfigInternal(ctx.UserContext(), serverID, configFile, body, override, actorID, actorUsername)
} }
func (as *ConfigService) updateConfigFiles(ctx context.Context, server *model.Server, configFile string, body *map[string]interface{}, override bool) ([]byte, []byte, error) { func (as *ConfigService) updateConfigFiles(ctx context.Context, server *model.Server, configFile string, body *map[string]interface{}, override bool) ([]byte, []byte, error) {
@@ -155,7 +249,7 @@ func (as *ConfigService) updateConfigFiles(ctx context.Context, server *model.Se
return oldDataUTF8, newData, nil return oldDataUTF8, newData, nil
} }
func (as *ConfigService) updateConfigInternal(ctx context.Context, serverID string, configFile string, body *map[string]interface{}, override bool) (*model.Config, error) { func (as *ConfigService) updateConfigInternal(ctx context.Context, serverID string, configFile string, body *map[string]interface{}, override bool, actorID, actorUsername string) (*model.Config, error) {
serverUUID, err := uuid.Parse(serverID) serverUUID, err := uuid.Parse(serverID)
if err != nil { if err != nil {
logging.Error("Invalid server ID format: %v", err) logging.Error("Invalid server ID format: %v", err)
@@ -173,9 +267,34 @@ func (as *ConfigService) updateConfigInternal(ctx context.Context, serverID stri
return nil, err return nil, err
} }
as.configCache.InvalidateServerCache(serverID) if configFile == SettingsJson {
if nameVal, ok := (*body)["serverName"]; ok {
if nameStr, ok := nameVal.(string); ok && nameStr != "" && nameStr != server.Name {
server.Name = nameStr
if err := as.serverRepository.Update(ctx, server); err != nil {
logging.Error("Failed to update server name in DB: %v", err)
}
}
}
}
as.configCache.InvalidateServerCache(serverID)
as.serverService.StartAccServerRuntime(server) as.serverService.StartAccServerRuntime(server)
if as.activityLog != nil {
if details := BuildConfigDetails(configFile, oldDataUTF8, newData); details != "" {
go func() {
_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
ServerID: &serverUUID,
UserID: actorID,
Username: actorUsername,
Action: model.ActionConfigUpdate,
Details: details,
})
}()
}
}
return as.repository.UpdateConfig(ctx, &model.Config{ return as.repository.UpdateConfig(ctx, &model.Config{
ServerID: serverUUID, ServerID: serverUUID,
ConfigFile: configFile, ConfigFile: configFile,
@@ -420,6 +539,14 @@ func (as *ConfigService) GetConfiguration(server *model.Server) (*model.Configur
return &config, nil return &config, nil
} }
func (as *ConfigService) SetIgnorePrematureDisconnects(server *model.Server, value int) error {
configMap := map[string]interface{}{
"ignorePrematureDisconnects": value,
}
_, _, err := as.updateConfigFiles(context.Background(), server, SettingsJson, &configMap, false)
return err
}
func (as *ConfigService) SaveConfiguration(server *model.Server, config *model.Configuration) error { func (as *ConfigService) SaveConfiguration(server *model.Server, config *model.Configuration) error {
configMap := make(map[string]interface{}) configMap := make(map[string]interface{})
configBytes, err := json.Marshal(config) configBytes, err := json.Marshal(config)
@@ -433,3 +560,17 @@ func (as *ConfigService) SaveConfiguration(server *model.Server, config *model.C
_, _, err = as.updateConfigFiles(context.Background(), server, ConfigurationJson, &configMap, true) _, _, err = as.updateConfigFiles(context.Background(), server, ConfigurationJson, &configMap, true)
return err return err
} }
// ApplySection writes a single config section to the server's config file and
// records the change. It is used by ConfigPresetService to apply preset sections.
func (as *ConfigService) ApplySection(ctx context.Context, serverID, configFile string, body *map[string]interface{}, actorID, actorUsername string) (*model.Config, error) {
return as.updateConfigInternal(ctx, serverID, configFile, body, true, actorID, actorUsername)
}
func (as *ConfigService) SetServerName(server *model.Server, name string) error {
configMap := map[string]interface{}{
"serverName": name,
}
_, _, err := as.updateConfigFiles(context.Background(), server, SettingsJson, &configMap, false)
return err
}

View File

@@ -0,0 +1,210 @@
package service
import (
"acc-server-manager/local/model"
"acc-server-manager/local/repository"
"acc-server-manager/local/utl/logging"
"context"
"encoding/json"
"fmt"
"github.com/google/uuid"
)
const (
presetMaxNameLen = 100
presetMaxDescLen = 500
presetMaxSectionBytes = 64 * 1024 // 64 KB per config section
)
type ConfigPresetService struct {
repository *repository.ConfigPresetRepository
configService *ConfigService
activityLog *ActivityLogService
}
func NewConfigPresetService(repo *repository.ConfigPresetRepository, configService *ConfigService, activityLog *ActivityLogService) *ConfigPresetService {
return &ConfigPresetService{
repository: repo,
configService: configService,
activityLog: activityLog,
}
}
func (s *ConfigPresetService) ListPresets(ctx context.Context, filter *model.ConfigPresetFilter) (*[]model.ConfigPreset, error) {
return s.repository.GetAll(ctx, filter)
}
func (s *ConfigPresetService) GetPreset(ctx context.Context, id uuid.UUID) (*model.ConfigPreset, error) {
preset, err := s.repository.GetByID(ctx, id)
if err != nil {
return nil, err
}
if preset == nil {
return nil, fmt.Errorf("preset not found")
}
return preset, nil
}
func (s *ConfigPresetService) CreatePreset(ctx context.Context, req *model.ConfigPresetCreateRequest, actorID, actorUsername string) (*model.ConfigPreset, error) {
if req.Name == "" {
return nil, fmt.Errorf("preset name is required")
}
if len(req.Name) > presetMaxNameLen {
return nil, fmt.Errorf("preset name exceeds maximum length of %d characters", presetMaxNameLen)
}
if len(req.Description) > presetMaxDescLen {
return nil, fmt.Errorf("preset description exceeds maximum length of %d characters", presetMaxDescLen)
}
preset := &model.ConfigPreset{
Name: req.Name,
Description: req.Description,
}
if err := marshalSections(req.Configuration, req.AssistRules, req.Event, req.EventRules, req.Settings, preset); err != nil {
return nil, err
}
if err := s.repository.Insert(ctx, preset); err != nil {
return nil, err
}
details := fmt.Sprintf(`{"preset_id":%q,"preset_name":%q}`, preset.ID, preset.Name)
go func() {
if logErr := s.activityLog.Log(context.Background(), &model.ActivityLog{
UserID: actorID,
Username: actorUsername,
Action: model.ActionPresetCreate,
Details: details,
}); logErr != nil {
logging.Error("Failed to log preset create: %v", logErr)
}
}()
return preset, nil
}
func (s *ConfigPresetService) UpdatePreset(ctx context.Context, id uuid.UUID, req *model.ConfigPresetUpdateRequest) (*model.ConfigPreset, error) {
preset, err := s.GetPreset(ctx, id)
if err != nil {
return nil, err
}
if req.Name != nil {
if len(*req.Name) == 0 {
return nil, fmt.Errorf("preset name cannot be empty")
}
if len(*req.Name) > presetMaxNameLen {
return nil, fmt.Errorf("preset name exceeds maximum length of %d characters", presetMaxNameLen)
}
preset.Name = *req.Name
}
if req.Description != nil {
if len(*req.Description) > presetMaxDescLen {
return nil, fmt.Errorf("preset description exceeds maximum length of %d characters", presetMaxDescLen)
}
preset.Description = *req.Description
}
if err := marshalSections(req.Configuration, req.AssistRules, req.Event, req.EventRules, req.Settings, preset); err != nil {
return nil, err
}
if err := s.repository.Update(ctx, preset); err != nil {
return nil, err
}
return preset, nil
}
func (s *ConfigPresetService) DeletePreset(ctx context.Context, id uuid.UUID) error {
return s.repository.Delete(ctx, id)
}
func (s *ConfigPresetService) ApplyPreset(ctx context.Context, serverID string, presetID uuid.UUID, actorID, actorUsername string) ([]*model.Config, error) {
preset, err := s.GetPreset(ctx, presetID)
if err != nil {
return nil, err
}
serverUUID, err := uuid.Parse(serverID)
if err != nil {
return nil, fmt.Errorf("invalid server ID: %v", err)
}
type sectionEntry struct {
fileName string
raw string
}
sections := []sectionEntry{
{ConfigurationJson, preset.Configuration},
{AssistRulesJson, preset.AssistRules},
{EventJson, preset.Event},
{EventRulesJson, preset.EventRules},
{SettingsJson, preset.Settings},
}
var results []*model.Config
for _, section := range sections {
if section.raw == "" {
continue
}
var body map[string]interface{}
if err := json.Unmarshal([]byte(section.raw), &body); err != nil {
return nil, fmt.Errorf("failed to unmarshal preset section %s: %v", section.fileName, err)
}
result, err := s.configService.ApplySection(ctx, serverID, section.fileName, &body, actorID, actorUsername)
if err != nil {
return nil, fmt.Errorf("failed to apply preset section %s: %v", section.fileName, err)
}
if result != nil {
results = append(results, result)
}
}
details := fmt.Sprintf(`{"preset_id":%q,"preset_name":%q,"sections_applied":%d}`, presetID, preset.Name, len(results))
go func() {
if logErr := s.activityLog.Log(context.Background(), &model.ActivityLog{
ServerID: &serverUUID,
UserID: actorID,
Username: actorUsername,
Action: model.ActionPresetApply,
Details: details,
}); logErr != nil {
logging.Error("Failed to log preset apply: %v", logErr)
}
}()
return results, nil
}
// marshalSections marshals each non-nil config section into the preset's JSON string fields,
// enforcing the per-section byte size limit.
func marshalSections(configuration, assistRules, event, eventRules, settings *map[string]interface{}, preset *model.ConfigPreset) error {
type entry struct {
src *map[string]interface{}
name string
dest *string
}
entries := []entry{
{configuration, "configuration", &preset.Configuration},
{assistRules, "assistRules", &preset.AssistRules},
{event, "event", &preset.Event},
{eventRules, "eventRules", &preset.EventRules},
{settings, "settings", &preset.Settings},
}
for _, e := range entries {
if e.src == nil {
continue
}
b, err := json.Marshal(e.src)
if err != nil {
return fmt.Errorf("failed to marshal %s: %v", e.name, err)
}
if len(b) > presetMaxSectionBytes {
return fmt.Errorf("%s section exceeds maximum size of %d bytes", e.name, presetMaxSectionBytes)
}
*e.dest = string(b)
}
return nil
}

View File

@@ -6,7 +6,9 @@ import (
"bufio" "bufio"
"context" "context"
"io" "io"
"strconv"
"sync" "sync"
"time"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
dockerclient "github.com/docker/docker/client" dockerclient "github.com/docker/docker/client"
@@ -24,14 +26,14 @@ func NewDockerLogStreamer(client *dockerclient.Client) *DockerLogStreamer {
} }
func (s *DockerLogStreamer) Start(ctx context.Context, server *model.Server, handleLine func(string)) error { func (s *DockerLogStreamer) Start(ctx context.Context, server *model.Server, handleLine func(string)) error {
if _, exists := s.cancels.Load(server.ID); exists { s.Stop(server.ID)
return nil
}
if server.ContainerID == "" { if server.ContainerID == "" {
logging.Warn("DockerLogStreamer.Start: no container ID for server %s, skipping", server.ID) logging.Warn("DockerLogStreamer.Start: no container ID for server %s, skipping", server.ID)
return nil return nil
} }
since := time.Now().UTC().Format(time.RFC3339)
streamCtx, cancel := context.WithCancel(ctx) streamCtx, cancel := context.WithCancel(ctx)
s.cancels.Store(server.ID, cancel) s.cancels.Store(server.ID, cancel)
@@ -43,6 +45,7 @@ func (s *DockerLogStreamer) Start(ctx context.Context, server *model.Server, han
ShowStderr: true, ShowStderr: true,
Follow: true, Follow: true,
Timestamps: false, Timestamps: false,
Since: since,
}) })
if err != nil { if err != nil {
logging.Error("DockerLogStreamer: failed to attach to container %s: %v", server.ContainerID[:12], err) logging.Error("DockerLogStreamer: failed to attach to container %s: %v", server.ContainerID[:12], err)
@@ -72,3 +75,34 @@ func (s *DockerLogStreamer) Stop(serverID uuid.UUID) {
v.(context.CancelFunc)() v.(context.CancelFunc)()
} }
} }
func (s *DockerLogStreamer) GetLastLines(ctx context.Context, server *model.Server, n int) ([]string, error) {
if n <= 0 || server.ContainerID == "" {
return []string{}, nil
}
rc, err := s.client.ContainerLogs(ctx, server.ContainerID, types.ContainerLogsOptions{
ShowStdout: true,
ShowStderr: true,
Tail: strconv.Itoa(n),
})
if err != nil {
return nil, err
}
defer rc.Close()
pr, pw := io.Pipe()
go func() {
defer pw.Close()
if _, err := stdcopy.StdCopy(pw, pw, rc); err != nil && err != io.EOF {
logging.Warn("DockerLogStreamer.GetLastLines: stdcopy error for %s: %v", server.ServiceName, err)
}
}()
var lines []string
scanner := bufio.NewScanner(pr)
for scanner.Scan() {
lines = append(lines, scanner.Text())
}
return lines, scanner.Err()
}

View File

@@ -33,23 +33,25 @@ func NewDockerRuntime(client *dockerclient.Client, repo *repository.ServerReposi
func (r *DockerRuntime) Create(ctx context.Context, server *model.Server) error { func (r *DockerRuntime) Create(ctx context.Context, server *model.Server) error {
image := env.GetACCImage() image := env.GetACCImage()
// ACC uses the same port number for both TCP (client connections) and UDP (car positions/ping).
portStr := strconv.Itoa(server.Port) portStr := strconv.Itoa(server.Port)
natPort, err := nat.NewPort("tcp", portStr)
natTCP, err := nat.NewPort("tcp", portStr)
if err != nil { if err != nil {
return fmt.Errorf("invalid port %d: %v", server.Port, err) return fmt.Errorf("invalid port %d: %v", server.Port, err)
} }
natPortUDP, err := nat.NewPort("udp", portStr) natUDP, err := nat.NewPort("udp", portStr)
if err != nil { if err != nil {
return fmt.Errorf("invalid udp port %d: %v", server.Port, err) return fmt.Errorf("invalid port %d: %v", server.Port, err)
} }
portBindings := nat.PortMap{ portBindings := nat.PortMap{
natPort: []nat.PortBinding{{HostPort: portStr}}, natTCP: []nat.PortBinding{{HostPort: portStr}},
natPortUDP: []nat.PortBinding{{HostPort: portStr}}, natUDP: []nat.PortBinding{{HostPort: portStr}},
} }
exposedPorts := nat.PortSet{ exposedPorts := nat.PortSet{
natPort: struct{}{}, natTCP: struct{}{},
natPortUDP: struct{}{}, natUDP: struct{}{},
} }
containerBase := env.GetACCServersPath() containerBase := env.GetACCServersPath()
@@ -71,6 +73,8 @@ func (r *DockerRuntime) Create(ctx context.Context, server *model.Server) error
Binds: binds, Binds: binds,
PortBindings: portBindings, PortBindings: portBindings,
RestartPolicy: container.RestartPolicy{Name: "unless-stopped"}, RestartPolicy: container.RestartPolicy{Name: "unless-stopped"},
// NET_RAW is required for tcpdump packet capture in debug mode (DEBUG_MODE=1).
CapAdd: []string{"NET_RAW"},
}, nil, nil, server.ServiceName) }, nil, nil, server.ServiceName)
if err != nil { if err != nil {
return fmt.Errorf("failed to create container %s: %v", server.ServiceName, err) return fmt.Errorf("failed to create container %s: %v", server.ServiceName, err)
@@ -102,10 +106,19 @@ func (r *DockerRuntime) Delete(ctx context.Context, serverID uuid.UUID) error {
} }
func (r *DockerRuntime) Start(ctx context.Context, serverID uuid.UUID) (string, error) { func (r *DockerRuntime) Start(ctx context.Context, serverID uuid.UUID) (string, error) {
containerID, err := r.resolveContainerID(ctx, serverID) server, err := r.repo.GetByID(ctx, serverID)
if err != nil {
return "", fmt.Errorf("failed to look up server %s: %v", serverID, err)
}
if server == nil {
return "", fmt.Errorf("server %s not found", serverID)
}
containerID, err := r.ensureContainer(ctx, server)
if err != nil { if err != nil {
return "", err return "", err
} }
if err := r.client.ContainerStart(ctx, containerID, types.ContainerStartOptions{}); err != nil { if err := r.client.ContainerStart(ctx, containerID, types.ContainerStartOptions{}); err != nil {
return "", fmt.Errorf("failed to start container: %v", err) return "", fmt.Errorf("failed to start container: %v", err)
} }
@@ -124,16 +137,44 @@ func (r *DockerRuntime) Stop(ctx context.Context, serverID uuid.UUID) (string, e
} }
func (r *DockerRuntime) Restart(ctx context.Context, serverID uuid.UUID) (string, error) { func (r *DockerRuntime) Restart(ctx context.Context, serverID uuid.UUID) (string, error) {
containerID, err := r.resolveContainerID(ctx, serverID) server, err := r.repo.GetByID(ctx, serverID)
if err != nil {
return "", fmt.Errorf("failed to look up server %s: %v", serverID, err)
}
if server == nil {
return "", fmt.Errorf("server %s not found", serverID)
}
containerID, err := r.ensureContainer(ctx, server)
if err != nil { if err != nil {
return "", err return "", err
} }
if err := r.client.ContainerRestart(ctx, containerID, container.StopOptions{}); err != nil { if err := r.client.ContainerRestart(ctx, containerID, container.StopOptions{}); err != nil {
return "", fmt.Errorf("failed to restart container: %v", err) return "", fmt.Errorf("failed to restart container: %v", err)
} }
return model.StatusRunning.String(), nil return model.StatusRunning.String(), nil
} }
// ensureContainer returns the container ID for a server, recreating the container
// from the server's current DB record if it no longer exists in Docker.
func (r *DockerRuntime) ensureContainer(ctx context.Context, server *model.Server) (string, error) {
if server.ContainerID != "" {
if _, err := r.client.ContainerInspect(ctx, server.ContainerID); err == nil {
return server.ContainerID, nil
}
logging.Info("Container %s for server %s no longer exists, recreating", server.ContainerID[:min(12, len(server.ContainerID))], server.ID)
}
if err := r.Create(ctx, server); err != nil {
return "", fmt.Errorf("failed to recreate container: %v", err)
}
if err := r.repo.Update(ctx, server); err != nil {
return "", fmt.Errorf("container recreated but failed to persist container ID: %v", err)
}
return server.ContainerID, nil
}
func (r *DockerRuntime) Status(ctx context.Context, serverID uuid.UUID) (string, error) { func (r *DockerRuntime) Status(ctx context.Context, serverID uuid.UUID) (string, error) {
server, err := r.repo.GetByID(ctx, serverID) server, err := r.repo.GetByID(ctx, serverID)
if err != nil || server == nil { if err != nil || server == nil {

View File

@@ -3,7 +3,9 @@ package service
import ( import (
"acc-server-manager/local/model" "acc-server-manager/local/model"
"acc-server-manager/local/utl/tracking" "acc-server-manager/local/utl/tracking"
"bufio"
"context" "context"
"os"
"path/filepath" "path/filepath"
"sync" "sync"
@@ -36,3 +38,40 @@ func (s *FileLogStreamer) Stop(serverID uuid.UUID) {
v.(*tracking.LogTailer).Stop() v.(*tracking.LogTailer).Stop()
} }
} }
func (s *FileLogStreamer) GetLastLines(_ context.Context, server *model.Server, n int) ([]string, error) {
if n <= 0 {
return []string{}, nil
}
logPath := filepath.Join(server.GetLogPath(), "server.log")
f, err := os.Open(logPath)
if err != nil {
if os.IsNotExist(err) {
return []string{}, nil
}
return nil, err
}
defer f.Close()
ring := make([]string, n)
head := 0
count := 0
scanner := bufio.NewScanner(f)
for scanner.Scan() {
ring[head] = scanner.Text()
head = (head + 1) % n
if count < n {
count++
}
}
if err := scanner.Err(); err != nil {
return nil, err
}
if count < n {
return ring[:count], nil
}
out := make([]string, n)
copy(out, ring[head:])
copy(out[n-head:], ring[:head])
return out, nil
}

View File

@@ -3,6 +3,7 @@ package service
import ( import (
"acc-server-manager/local/model" "acc-server-manager/local/model"
"acc-server-manager/local/repository" "acc-server-manager/local/repository"
"acc-server-manager/local/utl/logging"
"context" "context"
"fmt" "fmt"
@@ -10,11 +11,12 @@ import (
) )
type LeaderboardService struct { type LeaderboardService struct {
repo *repository.LeaderboardRepository repo *repository.LeaderboardRepository
activityLog *ActivityLogService
} }
func NewLeaderboardService(repo *repository.LeaderboardRepository) *LeaderboardService { func NewLeaderboardService(repo *repository.LeaderboardRepository, activityLog *ActivityLogService) *LeaderboardService {
return &LeaderboardService{repo: repo} return &LeaderboardService{repo: repo, activityLog: activityLog}
} }
// Get returns the leaderboard for a server. // Get returns the leaderboard for a server.
@@ -23,7 +25,7 @@ func (s *LeaderboardService) Get(ctx context.Context, serverID uuid.UUID) (*mode
} }
// Update replaces the leaderboard for a server. // Update replaces the leaderboard for a server.
func (s *LeaderboardService) Update(ctx context.Context, serverID uuid.UUID, lb *model.Leaderboard) (*model.Leaderboard, error) { func (s *LeaderboardService) Update(ctx context.Context, serverID uuid.UUID, lb *model.Leaderboard, actorID, actorUsername string) (*model.Leaderboard, error) {
if lb == nil { if lb == nil {
return nil, fmt.Errorf("input is required") return nil, fmt.Errorf("input is required")
} }
@@ -33,5 +35,25 @@ func (s *LeaderboardService) Update(ctx context.Context, serverID uuid.UUID, lb
for i := range lb.Races { for i := range lb.Races {
lb.Races[i].Position = i lb.Races[i].Position = i
} }
return s.repo.FullReplace(ctx, serverID, lb) result, err := s.repo.FullReplace(ctx, serverID, lb)
if err != nil {
return nil, err
}
driverCount := len(lb.Drivers)
raceCount := len(lb.Races)
details := fmt.Sprintf(`{"driver_count":%d,"race_count":%d}`, driverCount, raceCount)
go func() {
if logErr := s.activityLog.Log(context.Background(), &model.ActivityLog{
ServerID: &serverID,
UserID: actorID,
Username: actorUsername,
Action: model.ActionLeaderboardUpdate,
Details: details,
}); logErr != nil {
logging.Error("Failed to log leaderboard update: %v", logErr)
}
}()
return result, nil
} }

View File

@@ -26,12 +26,13 @@ const (
type ServerService struct { type ServerService struct {
repository *repository.ServerRepository repository *repository.ServerRepository
stateHistoryRepo *repository.StateHistoryRepository stateHistoryRepo *repository.StateHistoryRepository
activityLogRepo *repository.ActivityLogRepository
apiService *ServiceControlService apiService *ServiceControlService
configService *ConfigService configService *ConfigService
steamService *SteamService steamService *SteamService
runtime platform.ServerRuntime runtime platform.ServerRuntime
firewall platform.FirewallManager firewall platform.FirewallManager
logStreamer platform.LogStreamer logStreamer platform.LogStreamer
portPool *network.PortPoolManager portPool *network.PortPoolManager
webSocketService *WebSocketService webSocketService *WebSocketService
instances sync.Map // uuid.UUID → *tracking.AccServerInstance instances sync.Map // uuid.UUID → *tracking.AccServerInstance
@@ -47,15 +48,31 @@ type pendingState struct {
func (s *ServerService) ensureLogTailing(server *model.Server, instance *tracking.AccServerInstance) { func (s *ServerService) ensureLogTailing(server *model.Server, instance *tracking.AccServerInstance) {
go func() { go func() {
if err := s.logStreamer.Start(context.Background(), server, instance.HandleLogLine); err != nil { handleFn := func(line string) {
instance.HandleLogLine(line)
s.webSocketService.BroadcastLogLine(server.ID, line)
}
if err := s.logStreamer.Start(context.Background(), server, handleFn); err != nil {
logging.Error("Failed to start log streaming for server %s: %v", server.ID, err) logging.Error("Failed to start log streaming for server %s: %v", server.ID, err)
} }
}() }()
} }
func (s *ServerService) GetLastLogLines(ctx *fiber.Ctx, serverID uuid.UUID, n int) ([]string, error) {
server, err := s.repository.GetByID(ctx.UserContext(), serverID)
if err != nil {
return nil, err
}
if n <= 0 {
n = 100
}
return s.logStreamer.GetLastLines(ctx.UserContext(), server, n)
}
func NewServerService( func NewServerService(
repository *repository.ServerRepository, repository *repository.ServerRepository,
stateHistoryRepo *repository.StateHistoryRepository, stateHistoryRepo *repository.StateHistoryRepository,
activityLogRepo *repository.ActivityLogRepository,
apiService *ServiceControlService, apiService *ServiceControlService,
configService *ConfigService, configService *ConfigService,
steamService *SteamService, steamService *SteamService,
@@ -68,6 +85,7 @@ func NewServerService(
service := &ServerService{ service := &ServerService{
repository: repository, repository: repository,
stateHistoryRepo: stateHistoryRepo, stateHistoryRepo: stateHistoryRepo,
activityLogRepo: activityLogRepo,
apiService: apiService, apiService: apiService,
configService: configService, configService: configService,
steamService: steamService, steamService: steamService,
@@ -266,6 +284,16 @@ func (s *ServerService) GetAll(ctx *fiber.Ctx, filter *model.ServerFilter) (*[]m
return nil, err return nil, err
} }
// Collect server IDs for a single last-activity lookup.
serverIDs := make([]uuid.UUID, len(*servers))
for i, srv := range *servers {
serverIDs[i] = srv.ID
}
lastActivities, laErr := s.activityLogRepo.GetLastActivityByServerIDs(ctx.UserContext(), serverIDs)
if laErr != nil {
logging.Error("Failed to get last activities for server list: %v", laErr)
}
for i := range *servers { for i := range *servers {
server := &(*servers)[i] server := &(*servers)[i]
status, err := s.apiService.GetCachedStatus(server.ServiceName) status, err := s.apiService.GetCachedStatus(server.ServiceName)
@@ -282,6 +310,11 @@ func (s *ServerService) GetAll(ctx *fiber.Ctx, filter *model.ServerFilter) (*[]m
server.State = serverInstance.State server.State = serverInstance.State
} }
} }
if lastActivities != nil {
if info, ok := lastActivities[server.ID]; ok {
server.LastActivity = info
}
}
} }
return servers, nil return servers, nil
@@ -403,6 +436,10 @@ func (s *ServerService) createServerBackground(ctx context.Context, server *mode
return "", fmt.Errorf("failed to update server configuration: %v", err) return "", fmt.Errorf("failed to update server configuration: %v", err)
} }
if err := s.configService.SetServerName(server, server.Name); err != nil {
logging.Error("Failed to set server name in config: %v", err)
}
return fmt.Sprintf("Server configuration generated (Port: %d)", serverPort), nil return fmt.Sprintf("Server configuration generated (Port: %d)", serverPort), nil
}, },
}, },
@@ -574,10 +611,17 @@ func (s *ServerService) updateServerPort(server *model.Server, port int) error {
config.TcpPort = model.IntString(port) config.TcpPort = model.IntString(port)
config.UdpPort = model.IntString(port) config.UdpPort = model.IntString(port)
config.RegisterToLobby = model.IntString(1)
if err := s.configService.SaveConfiguration(server, config); err != nil { if err := s.configService.SaveConfiguration(server, config); err != nil {
return fmt.Errorf("failed to save server configuration: %v", err) return fmt.Errorf("failed to save server configuration: %v", err)
} }
if env.IsDockerPlatform() {
if err := s.configService.SetIgnorePrematureDisconnects(server, 0); err != nil {
logging.Error("Failed to set ignorePrematureDisconnects for Docker server: %v", err)
}
}
return nil return nil
} }

View File

@@ -23,6 +23,7 @@ func InitializeServices(c *dig.Container) {
logging.Debug("Registering services") logging.Debug("Registering services")
c.Provide(NewSteamService) c.Provide(NewSteamService)
c.Provide(NewActivityLogService)
c.Provide(NewServerService) c.Provide(NewServerService)
c.Provide(NewStateHistoryService) c.Provide(NewStateHistoryService)
c.Provide(NewServiceControlService) c.Provide(NewServiceControlService)
@@ -31,6 +32,7 @@ func InitializeServices(c *dig.Container) {
c.Provide(NewMembershipService) c.Provide(NewMembershipService)
c.Provide(NewWebSocketService) c.Provide(NewWebSocketService)
c.Provide(NewLeaderboardService) c.Provide(NewLeaderboardService)
c.Provide(NewConfigPresetService)
// Always provide the PortPoolManager; in Windows mode it seeds from an // Always provide the PortPoolManager; in Windows mode it seeds from an
// empty result set and sits idle. // empty result set and sits idle.

View File

@@ -15,6 +15,7 @@ type ServiceControlService struct {
repository *repository.ServiceControlRepository repository *repository.ServiceControlRepository
serverRepository *repository.ServerRepository serverRepository *repository.ServerRepository
serverService *ServerService serverService *ServerService
activityLog *ActivityLogService
statusCache *model.ServerStatusCache statusCache *model.ServerStatusCache
runtime platform.ServerRuntime runtime platform.ServerRuntime
} }
@@ -23,11 +24,13 @@ func NewServiceControlService(
repository *repository.ServiceControlRepository, repository *repository.ServiceControlRepository,
serverRepository *repository.ServerRepository, serverRepository *repository.ServerRepository,
runtime platform.ServerRuntime, runtime platform.ServerRuntime,
activityLog *ActivityLogService,
) *ServiceControlService { ) *ServiceControlService {
return &ServiceControlService{ return &ServiceControlService{
repository: repository, repository: repository,
serverRepository: serverRepository, serverRepository: serverRepository,
runtime: runtime, runtime: runtime,
activityLog: activityLog,
statusCache: model.NewServerStatusCache(model.CacheConfig{ statusCache: model.NewServerStatusCache(model.CacheConfig{
ExpirationTime: 30 * time.Second, ExpirationTime: 30 * time.Second,
ThrottleTime: 5 * time.Second, ThrottleTime: 5 * time.Second,
@@ -36,6 +39,28 @@ func NewServiceControlService(
} }
} }
// getServerFromCtx resolves the server from ctx locals (serverId or service name).
func (as *ServiceControlService) getServerFromCtx(ctx *fiber.Ctx) (*model.Server, error) {
serviceName, ok := ctx.Locals("service").(string)
if !ok || serviceName == "" {
serverId, ok2 := ctx.Locals("serverId").(string)
if !ok2 || serverId == "" {
return nil, errors.New("service name missing")
}
return as.serverRepository.GetByID(ctx.UserContext(), serverId)
}
return as.serverRepository.GetFirstByServiceName(ctx.UserContext(), serviceName)
}
func extractActor(ctx *fiber.Ctx) (actorID, actorUsername string) {
actorID, _ = ctx.Locals("userID").(string)
actorUsername, _ = ctx.Locals("actorUsername").(string)
if actorUsername == "" {
actorUsername = "system"
}
return
}
func (as *ServiceControlService) SetServerService(serverService *ServerService) { func (as *ServiceControlService) SetServerService(serverService *ServerService) {
as.serverService = serverService as.serverService = serverService
} }
@@ -61,10 +86,11 @@ func (as *ServiceControlService) GetStatus(ctx *fiber.Ctx) (string, error) {
} }
func (as *ServiceControlService) ServiceControlStartServer(ctx *fiber.Ctx) (string, error) { func (as *ServiceControlService) ServiceControlStartServer(ctx *fiber.Ctx) (string, error) {
serviceName, err := as.GetServiceName(ctx) server, err := as.getServerFromCtx(ctx)
if err != nil { if err != nil {
return "", err return "", err
} }
serviceName := server.ServiceName
as.statusCache.UpdateStatus(serviceName, model.StatusStarting) as.statusCache.UpdateStatus(serviceName, model.StatusStarting)
@@ -79,14 +105,29 @@ func (as *ServiceControlService) ServiceControlStartServer(ctx *fiber.Ctx) (stri
status := model.ParseServiceStatus(statusStr) status := model.ParseServiceStatus(statusStr)
as.statusCache.UpdateStatus(serviceName, status) as.statusCache.UpdateStatus(serviceName, status)
if as.activityLog != nil {
actorID, actorUsername := extractActor(ctx)
go func() {
_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
ServerID: &server.ID,
UserID: actorID,
Username: actorUsername,
Action: model.ActionServerStart,
Details: `{"service":"` + serviceName + `"}`,
})
}()
}
return status.String(), nil return status.String(), nil
} }
func (as *ServiceControlService) ServiceControlStopServer(ctx *fiber.Ctx) (string, error) { func (as *ServiceControlService) ServiceControlStopServer(ctx *fiber.Ctx) (string, error) {
serviceName, err := as.GetServiceName(ctx) server, err := as.getServerFromCtx(ctx)
if err != nil { if err != nil {
return "", err return "", err
} }
serviceName := server.ServiceName
as.statusCache.UpdateStatus(serviceName, model.StatusStopping) as.statusCache.UpdateStatus(serviceName, model.StatusStopping)
@@ -101,14 +142,29 @@ func (as *ServiceControlService) ServiceControlStopServer(ctx *fiber.Ctx) (strin
status := model.ParseServiceStatus(statusStr) status := model.ParseServiceStatus(statusStr)
as.statusCache.UpdateStatus(serviceName, status) as.statusCache.UpdateStatus(serviceName, status)
if as.activityLog != nil {
actorID, actorUsername := extractActor(ctx)
go func() {
_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
ServerID: &server.ID,
UserID: actorID,
Username: actorUsername,
Action: model.ActionServerStop,
Details: `{"service":"` + serviceName + `"}`,
})
}()
}
return status.String(), nil return status.String(), nil
} }
func (as *ServiceControlService) ServiceControlRestartServer(ctx *fiber.Ctx) (string, error) { func (as *ServiceControlService) ServiceControlRestartServer(ctx *fiber.Ctx) (string, error) {
serviceName, err := as.GetServiceName(ctx) server, err := as.getServerFromCtx(ctx)
if err != nil { if err != nil {
return "", err return "", err
} }
serviceName := server.ServiceName
as.statusCache.UpdateStatus(serviceName, model.StatusRestarting) as.statusCache.UpdateStatus(serviceName, model.StatusRestarting)
@@ -123,6 +179,20 @@ func (as *ServiceControlService) ServiceControlRestartServer(ctx *fiber.Ctx) (st
status := model.ParseServiceStatus(statusStr) status := model.ParseServiceStatus(statusStr)
as.statusCache.UpdateStatus(serviceName, status) as.statusCache.UpdateStatus(serviceName, status)
if as.activityLog != nil {
actorID, actorUsername := extractActor(ctx)
go func() {
_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
ServerID: &server.ID,
UserID: actorID,
Username: actorUsername,
Action: model.ActionServerRestart,
Details: `{"service":"` + serviceName + `"}`,
})
}()
}
return status.String(), nil return status.String(), nil
} }

View File

@@ -103,6 +103,16 @@ func (ws *WebSocketService) BroadcastError(serverID uuid.UUID, error string, det
ws.broadcastToServer(serverID, wsMsg) ws.broadcastToServer(serverID, wsMsg)
} }
func (ws *WebSocketService) BroadcastLogLine(serverID uuid.UUID, line string) {
msg := model.WebSocketMessage{
Type: model.MessageTypeLogLine,
ServerID: &serverID,
Timestamp: time.Now().Unix(),
Data: model.LogLineMessage{Line: line},
}
ws.broadcastToServer(serverID, msg)
}
func (ws *WebSocketService) BroadcastComplete(serverID uuid.UUID, success bool, message string) { func (ws *WebSocketService) BroadcastComplete(serverID uuid.UUID, success bool, message string) {
completeMsg := model.CompleteMessage{ completeMsg := model.CompleteMessage{
ServerID: serverID, ServerID: serverID,

View File

@@ -28,6 +28,10 @@ type RouteGroups struct {
WebSocket fiber.Router WebSocket fiber.Router
Leaderboard fiber.Router Leaderboard fiber.Router
Steam fiber.Router Steam fiber.Router
ActivityLog fiber.Router
Groups fiber.Router
Log fiber.Router
Presets fiber.Router
} }
func CheckError(err error) { func CheckError(err error) {

View File

@@ -8,7 +8,7 @@ import (
) )
var ( var (
Version = "0.10.7" Version = "0.13.0"
Prefix = "v1" Prefix = "v1"
Secret string Secret string
SecretCode string SecretCode string

View File

@@ -54,6 +54,8 @@ func Migrate(db *gorm.DB) {
&model.LeaderboardRace{}, &model.LeaderboardRace{},
&model.LeaderboardResult{}, &model.LeaderboardResult{},
&model.LeaderboardPointRow{}, &model.LeaderboardPointRow{},
&model.ActivityLog{},
&model.ConfigPreset{},
) )
if err != nil { if err != nil {
@@ -80,6 +82,14 @@ func runMigrations(db *gorm.DB) {
logging.Error("Failed to run platform columns migration: %v", err) logging.Error("Failed to run platform columns migration: %v", err)
} }
if err := migrations.RunAddActivityLogMigration(db); err != nil {
logging.Error("Failed to run activity log migration: %v", err)
}
if err := migrations.RunAddConfigPresetsMigration(db); err != nil {
logging.Error("Failed to run config presets migration: %v", err)
}
logging.Info("Custom database migrations completed") logging.Info("Custom database migrations completed")
} }

View File

@@ -109,7 +109,7 @@ func createTestData(t *testing.T, tempDir string) *TestData {
configFiles := map[string]string{ configFiles := map[string]string{
"configuration.json": `{ "configuration.json": `{
"udpPort": "9231", "udpPort": "9231",
"tcpPort": "9232", "tcpPort": "9231",
"maxConnections": "30", "maxConnections": "30",
"lanDiscovery": "1", "lanDiscovery": "1",
"registerToLobby": "1", "registerToLobby": "1",
@@ -198,7 +198,7 @@ func createTestData(t *testing.T, tempDir string) *TestData {
sampleConfig := &model.Configuration{ sampleConfig := &model.Configuration{
UdpPort: model.IntString(9231), UdpPort: model.IntString(9231),
TcpPort: model.IntString(9232), TcpPort: model.IntString(9231),
MaxConnections: model.IntString(30), MaxConnections: model.IntString(30),
LanDiscovery: model.IntString(1), LanDiscovery: model.IntString(1),
RegisterToLobby: model.IntString(1), RegisterToLobby: model.IntString(1),

View File

@@ -294,7 +294,7 @@ func TestController_ConfigurationModel_JSONSerialization(t *testing.T) {
app.Get("/config", func(c *fiber.Ctx) error { app.Get("/config", func(c *fiber.Ctx) error {
config := &model.Configuration{ config := &model.Configuration{
UdpPort: model.IntString(9231), UdpPort: model.IntString(9231),
TcpPort: model.IntString(9232), TcpPort: model.IntString(9231),
MaxConnections: model.IntString(30), MaxConnections: model.IntString(30),
LanDiscovery: model.IntString(1), LanDiscovery: model.IntString(1),
RegisterToLobby: model.IntString(1), RegisterToLobby: model.IntString(1),
@@ -316,7 +316,7 @@ func TestController_ConfigurationModel_JSONSerialization(t *testing.T) {
tests.AssertNoError(t, err) tests.AssertNoError(t, err)
tests.AssertEqual(t, model.IntString(9231), response.UdpPort) tests.AssertEqual(t, model.IntString(9231), response.UdpPort)
tests.AssertEqual(t, model.IntString(9232), response.TcpPort) tests.AssertEqual(t, model.IntString(9231), response.TcpPort)
tests.AssertEqual(t, model.IntString(30), response.MaxConnections) tests.AssertEqual(t, model.IntString(30), response.MaxConnections)
tests.AssertEqual(t, model.IntString(1), response.LanDiscovery) tests.AssertEqual(t, model.IntString(1), response.LanDiscovery)
tests.AssertEqual(t, model.IntString(1), response.RegisterToLobby) tests.AssertEqual(t, model.IntString(1), response.RegisterToLobby)

View File

@@ -464,7 +464,7 @@ func TestServerConfigCache_Configuration(t *testing.T) {
serverID := uuid.New().String() serverID := uuid.New().String()
configuration := model.Configuration{ configuration := model.Configuration{
UdpPort: model.IntString(9231), UdpPort: model.IntString(9231),
TcpPort: model.IntString(9232), TcpPort: model.IntString(9231),
MaxConnections: model.IntString(30), MaxConnections: model.IntString(30),
LanDiscovery: model.IntString(1), LanDiscovery: model.IntString(1),
RegisterToLobby: model.IntString(1), RegisterToLobby: model.IntString(1),

View File

@@ -20,14 +20,14 @@ func TestConfigService_GetConfiguration_ValidFile(t *testing.T) {
configRepo := repository.NewConfigRepository(helper.DB) configRepo := repository.NewConfigRepository(helper.DB)
serverRepo := repository.NewServerRepository(helper.DB) serverRepo := repository.NewServerRepository(helper.DB)
configService := service.NewConfigService(configRepo, serverRepo) configService := service.NewConfigService(configRepo, serverRepo, nil)
config, err := configService.GetConfiguration(helper.TestData.Server) config, err := configService.GetConfiguration(helper.TestData.Server)
tests.AssertNoError(t, err) tests.AssertNoError(t, err)
tests.AssertNotNil(t, config) tests.AssertNotNil(t, config)
tests.AssertEqual(t, model.IntString(9231), config.UdpPort) tests.AssertEqual(t, model.IntString(9231), config.UdpPort)
tests.AssertEqual(t, model.IntString(9232), config.TcpPort) tests.AssertEqual(t, model.IntString(9231), config.TcpPort)
tests.AssertEqual(t, model.IntString(30), config.MaxConnections) tests.AssertEqual(t, model.IntString(30), config.MaxConnections)
tests.AssertEqual(t, model.IntString(1), config.LanDiscovery) tests.AssertEqual(t, model.IntString(1), config.LanDiscovery)
tests.AssertEqual(t, model.IntString(1), config.RegisterToLobby) tests.AssertEqual(t, model.IntString(1), config.RegisterToLobby)
@@ -43,7 +43,7 @@ func TestConfigService_GetEventConfig_ValidFile(t *testing.T) {
configRepo := repository.NewConfigRepository(helper.DB) configRepo := repository.NewConfigRepository(helper.DB)
serverRepo := repository.NewServerRepository(helper.DB) serverRepo := repository.NewServerRepository(helper.DB)
configService := service.NewConfigService(configRepo, serverRepo) configService := service.NewConfigService(configRepo, serverRepo, nil)
eventConfig, err := configService.GetEventConfig(helper.TestData.Server) eventConfig, err := configService.GetEventConfig(helper.TestData.Server)
tests.AssertNoError(t, err) tests.AssertNoError(t, err)
@@ -73,7 +73,7 @@ func TestConfigService_SaveConfiguration_Success(t *testing.T) {
configRepo := repository.NewConfigRepository(helper.DB) configRepo := repository.NewConfigRepository(helper.DB)
serverRepo := repository.NewServerRepository(helper.DB) serverRepo := repository.NewServerRepository(helper.DB)
configService := service.NewConfigService(configRepo, serverRepo) configService := service.NewConfigService(configRepo, serverRepo, nil)
newConfig := &model.Configuration{ newConfig := &model.Configuration{
UdpPort: model.IntString(9999), UdpPort: model.IntString(9999),
@@ -115,14 +115,14 @@ func TestConfigService_LoadConfigs_Success(t *testing.T) {
configRepo := repository.NewConfigRepository(helper.DB) configRepo := repository.NewConfigRepository(helper.DB)
serverRepo := repository.NewServerRepository(helper.DB) serverRepo := repository.NewServerRepository(helper.DB)
configService := service.NewConfigService(configRepo, serverRepo) configService := service.NewConfigService(configRepo, serverRepo, nil)
configs, err := configService.LoadConfigs(helper.TestData.Server) configs, err := configService.LoadConfigs(helper.TestData.Server)
tests.AssertNoError(t, err) tests.AssertNoError(t, err)
tests.AssertNotNil(t, configs) tests.AssertNotNil(t, configs)
tests.AssertEqual(t, model.IntString(9231), configs.Configuration.UdpPort) tests.AssertEqual(t, model.IntString(9231), configs.Configuration.UdpPort)
tests.AssertEqual(t, model.IntString(9232), configs.Configuration.TcpPort) tests.AssertEqual(t, model.IntString(9231), configs.Configuration.TcpPort)
tests.AssertEqual(t, "Test ACC Server", configs.Settings.ServerName) tests.AssertEqual(t, "Test ACC Server", configs.Settings.ServerName)
tests.AssertEqual(t, "admin123", configs.Settings.AdminPassword) tests.AssertEqual(t, "admin123", configs.Settings.AdminPassword)
tests.AssertEqual(t, "spa", configs.Event.Track) tests.AssertEqual(t, "spa", configs.Event.Track)
@@ -142,7 +142,7 @@ func TestConfigService_MalformedJSON(t *testing.T) {
configRepo := repository.NewConfigRepository(helper.DB) configRepo := repository.NewConfigRepository(helper.DB)
serverRepo := repository.NewServerRepository(helper.DB) serverRepo := repository.NewServerRepository(helper.DB)
configService := service.NewConfigService(configRepo, serverRepo) configService := service.NewConfigService(configRepo, serverRepo, nil)
config, err := configService.GetConfiguration(helper.TestData.Server) config, err := configService.GetConfiguration(helper.TestData.Server)
if err == nil { if err == nil {
@@ -245,7 +245,7 @@ func TestConfigService_Caching_Configuration(t *testing.T) {
configRepo := repository.NewConfigRepository(helper.DB) configRepo := repository.NewConfigRepository(helper.DB)
serverRepo := repository.NewServerRepository(helper.DB) serverRepo := repository.NewServerRepository(helper.DB)
configService := service.NewConfigService(configRepo, serverRepo) configService := service.NewConfigService(configRepo, serverRepo, nil)
config1, err := configService.GetConfiguration(helper.TestData.Server) config1, err := configService.GetConfiguration(helper.TestData.Server)
tests.AssertNoError(t, err) tests.AssertNoError(t, err)
@@ -264,7 +264,7 @@ func TestConfigService_Caching_Configuration(t *testing.T) {
tests.AssertNotNil(t, config2) tests.AssertNotNil(t, config2)
tests.AssertEqual(t, model.IntString(9231), config2.UdpPort) tests.AssertEqual(t, model.IntString(9231), config2.UdpPort)
tests.AssertEqual(t, model.IntString(9232), config2.TcpPort) tests.AssertEqual(t, model.IntString(9231), config2.TcpPort)
} }
func TestConfigService_Caching_EventConfig(t *testing.T) { func TestConfigService_Caching_EventConfig(t *testing.T) {
@@ -276,7 +276,7 @@ func TestConfigService_Caching_EventConfig(t *testing.T) {
configRepo := repository.NewConfigRepository(helper.DB) configRepo := repository.NewConfigRepository(helper.DB)
serverRepo := repository.NewServerRepository(helper.DB) serverRepo := repository.NewServerRepository(helper.DB)
configService := service.NewConfigService(configRepo, serverRepo) configService := service.NewConfigService(configRepo, serverRepo, nil)
event1, err := configService.GetEventConfig(helper.TestData.Server) event1, err := configService.GetEventConfig(helper.TestData.Server)
tests.AssertNoError(t, err) tests.AssertNoError(t, err)