fix race

backend/cmd/main.go

@@ -130,6 +130,7 @@ func main() {
 	}
 
 	router := gin.Default()
+	router.Use(handlers.CorsMiddleware("http://127.0.0.1:5173;http://localhost:5173"))
 	docs.SwaggerInfo.BasePath = "/api/v1"
 	docs.SwaggerInfo.Title = "HellreigN"
 	docs.SwaggerInfo.Version = "1.0"

backend/go.mod

@@ -6,6 +6,7 @@ require (
 	gitea.d3m0k1d.ru/d3m0k1d/HellreigN/proto v0.0.0-20260403210401-a6212c89fc0e
 	github.com/ClickHouse/clickhouse-go/v2 v2.44.0
 	github.com/gin-gonic/gin v1.12.0
+	github.com/samber/lo v1.53.0
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.1
 	github.com/swaggo/swag v1.16.6

backend/go.sum

@@ -138,6 +138,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM=
+github.com/samber/lo v1.53.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
 github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=

backend/internal/grpcsrv/commander/commander.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"log"
 	"sync"
 
 	"gitea.d3m0k1d.ru/d3m0k1d/HellreigN/backend/internal/models"
@@ -78,26 +77,21 @@ func (self *Commander) removeAgent(aid string) {
 }
 
 func (self *Agent) AddJob(job models.JobForInsert) (int64, error) {
-	log.Printf("[DEBUG] AddJob: agent=%s, command=%v", self.aid, job.Command)
 	jid, err := self.jobber.InitJob(self.ctx, self.aid, job)
 	if err != nil {
-		log.Printf("[DEBUG] AddJob: InitJob failed: %v", err)
 		return 0, err
 	}
-	log.Printf("[DEBUG] AddJob: InitJob returned jid=%d, sending to self.in channel", jid)
+	self.jobs[jid] = newJob()
 	self.in <- &proto.Command{
 		Id:      jid,
 		Command: job.Command,
 		Stdin:   job.Stdin,
 	}
-	log.Printf("[DEBUG] AddJob: sent to self.in channel successfully")
 	return jid, err
 }
 
 func (self *Agent) WaitJob(jid int64) (*models.Job, error) {
-	log.Printf("[DEBUG] WaitJob: agent=%s, jid=%d, waiting on self.jobs[%d].out", self.aid, jid, jid)
 	result := <-self.jobs[jid].out
-	log.Printf("[DEBUG] WaitJob: agent=%s, jid=%d, received result", self.aid, jid)
 	return &result.fc, result.err
 }
 
@@ -141,7 +135,6 @@ func (self *Agent) recv() error {
 			if err != nil {
 				return
 			}
-			log.Printf("[DEBUG] recv: agent=%s, received finished job id=%d", self.aid, msg.Id)
 			return self.jobber.UpdateJobInDB(self.ctx, msg.Id, models.JobForUpdate{
 				Stdout: msg.Stdout,
 				Stderr: msg.Stderr,
@@ -149,33 +142,24 @@ func (self *Agent) recv() error {
 			})
 		}()
 		if err == io.EOF {
-			log.Printf("[DEBUG] recv: agent=%s, EOF received", self.aid)
 			return nil
 		}
-		if err != nil {
-			log.Printf("[DEBUG] recv: agent=%s, error: %v", self.aid, err)
-		}
+		// TODO: that would blow up at some point
 		out := self.jobs[job.ID].out
 		out <- JobOut{
 			fc:  job,
 			err: err,
 		}
 		close(out)
-		log.Printf("[DEBUG] recv: agent=%s, sent result for job id=%d", self.aid, job.ID)
 	}
 }
 
 func (self *Agent) send() error {
 	for job := range self.in {
-		log.Printf("[DEBUG] send: agent=%s, job id=%d, command=%v", self.aid, job.Id, job.Command)
-		self.jobs[job.Id] = newJob()
 		if err := self.bidi.Send(job); err != nil {
-			log.Printf("[DEBUG] send: agent=%s, failed to send job id=%d: %v", self.aid, job.Id, err)
 			return err
 		}
-		log.Printf("[DEBUG] send: agent=%s, sent job id=%d to agent", self.aid, job.Id)
 	}
-	log.Printf("[DEBUG] send: agent=%s, self.in channel closed", self.aid)
 	return io.EOF
 	// self.jobs[]
 }

backend/internal/handlers/cors.go

@@ -0,0 +1,33 @@
+package handlers
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/samber/lo"
+)
+
+func CorsMiddleware(origincfg string) gin.HandlerFunc {
+	origins := strings.Split(origincfg, ";")
+	if origins[0] == "" {
+		panic("zero cors origins wtf is your config")
+	}
+	return func(c *gin.Context) {
+		origin := c.GetHeader("Origin")
+		if !lo.Contains(origins, origin) {
+			origin = origins[0]
+		}
+		c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
+		// c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
+		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, Authorization")
+		c.Writer.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST, PATCH, DELETE, PUT")
+
+		if c.Request.Method == "OPTIONS" {
+			c.AbortWithStatus(http.StatusNoContent)
+			return
+		}
+
+		c.Next()
+	}
+}

backend/internal/handlers/jobs.go

@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 
 	"gitea.d3m0k1d.ru/d3m0k1d/HellreigN/backend/internal/grpcsrv/commander"
@@ -45,21 +44,16 @@ type AddJobOut struct {
 // @Success 201 {object} AddJobOut
 // @Router /jobs [post]
 func (self *JobsHandlers) AddJob(c *gin.Context) {
-	log.Printf("[DEBUG] AddJob handler: request received")
 	err := func() error {
 		var in AddJobIn
 		if err := c.Bind(&in); err != nil {
-			log.Printf("[DEBUG] AddJob handler: bind failed: %v", err)
 			return err
 		}
-		log.Printf("[DEBUG] AddJob handler: agent_id=%s, command=%s, interpreter_id=%d", in.AgentID, in.Command, in.InterpreterID)
 		agent, ok := self.cmder.GetAgent(in.AgentID)
 		if !ok {
-			log.Printf("[DEBUG] AddJob handler: agent %s not found", in.AgentID)
 			c.Status(http.StatusNotFound)
 			return fmt.Errorf("agent not found")
 		}
-		log.Printf("[DEBUG] AddJob handler: agent found, resolving command")
 
 		var command []string
 		if in.InterpreterID == 0 {
@@ -68,27 +62,21 @@ func (self *JobsHandlers) AddJob(c *gin.Context) {
 			var err error
 			command, err = self.svc.ResolveCommand(c.Request.Context(), in.InterpreterID, in.Command)
 			if err != nil {
-				log.Printf("[DEBUG] AddJob handler: ResolveCommand failed: %v", err)
 				return err
 			}
 		}
 
-		log.Printf("[DEBUG] AddJob handler: calling agent.AddJob with command=%v", command)
 		jid, err := agent.AddJob(models.JobForInsert{
 			Command: command,
 			Stdin:   in.Stdin,
 		})
 		if err != nil {
-			log.Printf("[DEBUG] AddJob handler: agent.AddJob failed: %v", err)
 			return err
 		}
-		log.Printf("[DEBUG] AddJob handler: agent.AddJob returned jid=%d, calling WaitJob", jid)
 		job, err := agent.WaitJob(jid)
 		if err != nil {
-			log.Printf("[DEBUG] AddJob handler: agent.WaitJob failed: %v", err)
 			return err
 		}
-		log.Printf("[DEBUG] AddJob handler: agent.WaitJob returned job id=%d, status=%d", job.ID, job.Status)
 		c.JSON(http.StatusCreated, AddJobOut{
 			ID:      job.ID,
 			Command: job.Command,
@@ -97,7 +85,6 @@ func (self *JobsHandlers) AddJob(c *gin.Context) {
 			Stderr:  job.Stderr,
 			Status:  job.Status,
 		})
-		log.Printf("[DEBUG] AddJob handler: response sent")
 		return nil
 	}()
 	if err != nil {