Files
flatrender/services/render/internal/db/scan.go
T
soroush.asadi 6661f53734
Build backend images / build content-svc (push) Failing after 1m25s
Build backend images / build file-svc (push) Failing after 1m10s
Build backend images / build gateway (push) Failing after 56s
Build backend images / build identity-svc (push) Failing after 53s
Build backend images / build notification-svc (push) Failing after 57s
Build backend images / build render-svc (push) Failing after 48s
Build backend images / build studio-svc (push) Failing after 1m5s
fix(scan): Fix-mode scanner + dialog suppression + cancel/timer + importer revive
- scan.jsx: app.beginSuppressDialogs() + clean quit (no AE hang on font/footage
  dialogs); FIX-mode branch parses frl_c(x)t/m(y) layer names → scenes by c(x);
  flexible/mockup keep comp-based walk; FR_SCAN_MODE selects.
- render-svc: scan job carries project mode; cancel endpoint + node watchdog that
  kills AE on cancel; parseObjectURL handles minio:// (bucket in host); scan with
  no template fails cleanly; status guards so late results can't un-cancel.
- content importer: revive soft-deleted scenes instead of duplicate-inserting
  (fixes scenes_project_id_key unique violation); orphan diff ignores deleted.
- admin: scan dialog gets project-type picker + elapsed timer + Cancel button.
- node-agent: AE-2026 wiring (host port 5010, host-reachable presign endpoint),
  FR_SCAN_MODE plumbing. docs/aep-template-convention.md: per-type naming + bundles.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-04 19:06:08 +03:30

110 lines
3.6 KiB
Go

package db
import (
"context"
"encoding/json"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
)
// ScanJob is an async "scan this project's AE template" job.
type ScanJob struct {
ID uuid.UUID `json:"id"`
ProjectID uuid.UUID `json:"project_id"`
Status string `json:"status"` // queued | running | done | error
Engine string `json:"engine"`
Result json.RawMessage `json:"result,omitempty"` // ScanResult JSON, present when done
Error *string `json:"error,omitempty"`
}
// ScanClaim is the minimal info a node needs to run a claimed scan.
type ScanClaim struct {
ID uuid.UUID
ProjectID uuid.UUID
Mode string // fix | flexible | mockup | musicvisualizer → drives scan.jsx parsing
}
func (s *Store) CreateScanJob(ctx context.Context, projectID uuid.UUID, engine, mode string) (uuid.UUID, error) {
if mode == "" {
mode = "flexible"
}
var id uuid.UUID
err := s.pool.QueryRow(ctx,
`INSERT INTO render.scan_jobs (project_id, engine, status, mode) VALUES ($1, $2, 'queued', $3) RETURNING id`,
projectID, engine, mode).Scan(&id)
return id, err
}
// ClaimScanJob atomically grabs the oldest queued ae-jsx scan for a node.
// Returns nil when the queue is empty.
func (s *Store) ClaimScanJob(ctx context.Context, nodeID uuid.UUID) (*ScanClaim, error) {
var c ScanClaim
err := s.pool.QueryRow(ctx, `
UPDATE render.scan_jobs SET status = 'running', node_id = $1, updated_at = NOW()
WHERE id = (
SELECT id FROM render.scan_jobs
WHERE status = 'queued' AND engine = 'ae-jsx'
ORDER BY created_at
LIMIT 1 FOR UPDATE SKIP LOCKED
)
RETURNING id, project_id, mode`, nodeID).Scan(&c.ID, &c.ProjectID, &c.Mode)
if err != nil {
if err == pgx.ErrNoRows {
return nil, nil
}
return nil, err
}
return &c, nil
}
// SetScanResult / SetScanError only act on a 'running' job, so a result that
// arrives after the user cancelled doesn't un-cancel it.
func (s *Store) SetScanResult(ctx context.Context, id uuid.UUID, resultJSON string) error {
_, err := s.pool.Exec(ctx,
`UPDATE render.scan_jobs SET status = 'done', result = $2::jsonb, error = NULL, updated_at = NOW() WHERE id = $1 AND status = 'running'`,
id, resultJSON)
return err
}
func (s *Store) SetScanError(ctx context.Context, id uuid.UUID, msg string) error {
_, err := s.pool.Exec(ctx,
`UPDATE render.scan_jobs SET status = 'error', error = $2, updated_at = NOW() WHERE id = $1 AND status = 'running'`, id, msg)
return err
}
// CancelScanJob marks a queued/running scan as cancelled (user-requested). The
// node's watchdog sees this and kills the AE process.
func (s *Store) CancelScanJob(ctx context.Context, id uuid.UUID) error {
_, err := s.pool.Exec(ctx,
`UPDATE render.scan_jobs SET status = 'cancelled', error = 'cancelled by user', updated_at = NOW() WHERE id = $1 AND status IN ('queued','running')`, id)
return err
}
// GetScanStatus returns just the status string (lightweight, for the node watchdog).
func (s *Store) GetScanStatus(ctx context.Context, id uuid.UUID) (string, error) {
var st string
err := s.pool.QueryRow(ctx, `SELECT status FROM render.scan_jobs WHERE id = $1`, id).Scan(&st)
if err != nil {
if err == pgx.ErrNoRows {
return "", nil
}
return "", err
}
return st, nil
}
func (s *Store) GetScanJob(ctx context.Context, id uuid.UUID) (*ScanJob, error) {
var j ScanJob
err := s.pool.QueryRow(ctx,
`SELECT id, project_id, status, engine, result, error FROM render.scan_jobs WHERE id = $1`,
id).Scan(&j.ID, &j.ProjectID, &j.Status, &j.Engine, &j.Result, &j.Error)
if err != nil {
if err == pgx.ErrNoRows {
return nil, nil
}
return nil, err
}
return &j, nil
}