feat(render): full-screen render page, one-active-render limit, app-wide progress
Build backend images / build content-svc (push) Failing after 14s
Build backend images / build file-svc (push) Failing after 1m28s
Build backend images / build gateway (push) Failing after 1m43s
Build backend images / build identity-svc (push) Failing after 3m0s
Build backend images / build notification-svc (push) Failing after 51s
Build backend images / build render-svc (push) Failing after 1m3s
Build backend images / build studio-svc (push) Failing after 1m1s
Build backend images / build content-svc (push) Failing after 14s
Build backend images / build file-svc (push) Failing after 1m28s
Build backend images / build gateway (push) Failing after 1m43s
Build backend images / build identity-svc (push) Failing after 3m0s
Build backend images / build notification-svc (push) Failing after 51s
Build backend images / build render-svc (push) Failing after 1m3s
Build backend images / build studio-svc (push) Failing after 1m1s
Concurrent-render ceiling (a user runs 1 render at a time unless granted more):
- Identity: TokenService emits max_renders claim from User.ParallelRenderingCeiling
- Identity: admin POST /v1/users/{id}/render-slots (AdminService.SetRenderSlotsAsync,
clamped 1..50) — gamification or admin raises a user's ceiling
- render-svc: middleware reads max_renders (default 1); CreateJob rejects with 409
active_render_limit when active jobs >= ceiling
- render-svc: db.CountActiveJobs + ListActiveJobs; GET /v1/renders/active returns
in-flight renders + can_start_new
Full-screen render page (replaces the modal):
- /studio/render/[projectId]: config (resolution/fps) → live preview + progress →
download; resumes this project's in-flight render on mount; blocks when another
render is active; reads ?preset=
- StudioTopBar export menu now navigates to the page; RenderModal deleted (dead)
App-wide minimal progress:
- GlobalRenderProgress pill mounted in the locale layout for authed users; polls
/api/render/active every 4s, shows thumbnail + step + % on every page, click →
the render page; hidden on the render page and when idle
Admin: UserActions gains a "concurrent render slots" control.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -94,6 +94,7 @@ func main() {
|
||||
{
|
||||
renders.GET("", renderH.List)
|
||||
renders.POST("", renderH.Create)
|
||||
renders.GET("/active", renderH.Active)
|
||||
renders.GET("/:job_id", renderH.Get)
|
||||
renders.POST("/:job_id/cancel", renderH.Cancel)
|
||||
renders.POST("/:job_id/stop", admin, renderH.Stop)
|
||||
|
||||
@@ -371,6 +371,45 @@ func (s *Store) GetJobByID(ctx context.Context, id, userID uuid.UUID) (*models.R
|
||||
return jobs[0], nil
|
||||
}
|
||||
|
||||
// CountActiveJobs returns how many non-terminal render jobs the user currently has.
|
||||
// Used to enforce the per-user concurrent-render ceiling.
|
||||
func (s *Store) CountActiveJobs(ctx context.Context, userID uuid.UUID) (int, error) {
|
||||
var n int
|
||||
err := s.pool.QueryRow(ctx, `
|
||||
SELECT COUNT(*) FROM render.render_jobs
|
||||
WHERE user_id = $1
|
||||
AND step NOT IN ('Done'::render_step, 'Failed'::render_step, 'Cancelled'::render_step)`,
|
||||
userID).Scan(&n)
|
||||
return n, err
|
||||
}
|
||||
|
||||
// ListActiveJobs returns the user's in-flight render jobs (most recent first),
|
||||
// lightweight projection for the app-wide mini progress widget.
|
||||
func (s *Store) ListActiveJobs(ctx context.Context, userID uuid.UUID) ([]*models.RenderJob, error) {
|
||||
rows, err := s.pool.Query(ctx, `
|
||||
SELECT id, saved_project_id, name, step, render_progress, image_preview_b64, created_at
|
||||
FROM render.render_jobs
|
||||
WHERE user_id = $1
|
||||
AND step NOT IN ('Done'::render_step, 'Failed'::render_step, 'Cancelled'::render_step)
|
||||
ORDER BY created_at DESC`,
|
||||
userID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var out []*models.RenderJob
|
||||
for rows.Next() {
|
||||
j := &models.RenderJob{}
|
||||
if err := rows.Scan(&j.ID, &j.SavedProjectID, &j.Name, &j.Step,
|
||||
&j.RenderProgress, &j.ImagePreviewB64, &j.CreatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, j)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
func (s *Store) CreateJob(ctx context.Context, userID, tenantID uuid.UUID, req *models.RenderJobCreateRequest) (*models.RenderJob, error) {
|
||||
priceType := "Free"
|
||||
if req.PriceType != nil {
|
||||
|
||||
@@ -54,6 +54,39 @@ func (h *RenderHandler) List(c *gin.Context) {
|
||||
})
|
||||
}
|
||||
|
||||
// GET /v1/renders/active
|
||||
// Lightweight list of the user's in-flight renders + their ceiling — powers the
|
||||
// app-wide mini progress widget and the "can I start another render?" check.
|
||||
func (h *RenderHandler) Active(c *gin.Context) {
|
||||
userID := middleware.GetUserID(c)
|
||||
jobs, err := h.store.ListActiveJobs(c.Request.Context(), userID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, models.APIError{Code: "internal_error", Message: err.Error()})
|
||||
return
|
||||
}
|
||||
if jobs == nil {
|
||||
jobs = []*models.RenderJob{}
|
||||
}
|
||||
out := make([]gin.H, 0, len(jobs))
|
||||
for _, j := range jobs {
|
||||
out = append(out, gin.H{
|
||||
"id": j.ID,
|
||||
"saved_project_id": j.SavedProjectID,
|
||||
"name": j.Name,
|
||||
"step": j.Step,
|
||||
"render_progress": j.RenderProgress,
|
||||
"preview_b64": j.ImagePreviewB64,
|
||||
"created_at": j.CreatedAt,
|
||||
})
|
||||
}
|
||||
maxRenders := middleware.GetMaxRenders(c)
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"active": out,
|
||||
"max_renders": maxRenders,
|
||||
"can_start_new": len(out) < maxRenders,
|
||||
})
|
||||
}
|
||||
|
||||
// POST /v1/renders
|
||||
func (h *RenderHandler) Create(c *gin.Context) {
|
||||
userID := middleware.GetUserID(c)
|
||||
@@ -65,6 +98,20 @@ func (h *RenderHandler) Create(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// Concurrent-render ceiling: a user may run only `max_renders` renders at once
|
||||
// (default 1; raised by gamification level or an admin grant via the JWT claim).
|
||||
maxRenders := middleware.GetMaxRenders(c)
|
||||
active, err := h.store.CountActiveJobs(c.Request.Context(), userID)
|
||||
if err != nil {
|
||||
log.Printf("count active jobs failed (allowing render): %v", err)
|
||||
} else if active >= maxRenders {
|
||||
c.JSON(http.StatusConflict, models.APIError{
|
||||
Code: "active_render_limit",
|
||||
Message: "شما یک رندر در حال انجام دارید. برای شروع رندر جدید صبر کنید تا رندر فعلی کامل شود.",
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// Daily render-limit: consume one render charge (0 max = unlimited).
|
||||
allowed, err := h.identity.Consume(c.Request.Context(), userID)
|
||||
if err != nil {
|
||||
|
||||
@@ -3,6 +3,7 @@ package middleware
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/flatrender/render-svc/internal/models"
|
||||
@@ -12,10 +13,11 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
CtxUserID = "user_id"
|
||||
CtxTenantID = "tenant_id"
|
||||
CtxIsAdmin = "is_admin"
|
||||
CtxRole = "role"
|
||||
CtxUserID = "user_id"
|
||||
CtxTenantID = "tenant_id"
|
||||
CtxIsAdmin = "is_admin"
|
||||
CtxRole = "role"
|
||||
CtxMaxRenders = "max_renders"
|
||||
)
|
||||
|
||||
func JWTAuth(secret string) gin.HandlerFunc {
|
||||
@@ -54,10 +56,25 @@ func JWTAuth(secret string) gin.HandlerFunc {
|
||||
}
|
||||
role, _ := claims["role"].(string)
|
||||
|
||||
// max_renders: concurrent-render ceiling. Identity emits it as a string;
|
||||
// also accept a JSON number. Default 1 when absent/unparseable.
|
||||
maxRenders := 1
|
||||
switch v := claims["max_renders"].(type) {
|
||||
case string:
|
||||
if n, err := strconv.Atoi(v); err == nil && n > 0 {
|
||||
maxRenders = n
|
||||
}
|
||||
case float64:
|
||||
if v >= 1 {
|
||||
maxRenders = int(v)
|
||||
}
|
||||
}
|
||||
|
||||
c.Set(CtxUserID, userID)
|
||||
c.Set(CtxTenantID, tenantID)
|
||||
c.Set(CtxIsAdmin, isAdmin)
|
||||
c.Set(CtxRole, role)
|
||||
c.Set(CtxMaxRenders, maxRenders)
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
@@ -111,3 +128,16 @@ func GetTenantID(c *gin.Context) uuid.UUID {
|
||||
id, _ := v.(uuid.UUID)
|
||||
return id
|
||||
}
|
||||
|
||||
// GetMaxRenders returns the user's concurrent-render ceiling (default 1).
|
||||
func GetMaxRenders(c *gin.Context) int {
|
||||
v, ok := c.Get(CtxMaxRenders)
|
||||
if !ok {
|
||||
return 1
|
||||
}
|
||||
n, _ := v.(int)
|
||||
if n < 1 {
|
||||
return 1
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user