From 296aa3f8a145a8fbc08db9f5b1d45fe6f72a38a4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 5 Aug 2024 03:57:21 +0900 Subject: feat: implement task queue --- backend/game/hub.go | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'backend/game/hub.go') diff --git a/backend/game/hub.go b/backend/game/hub.go index 70bf71f..a44bce0 100644 --- a/backend/game/hub.go +++ b/backend/game/hub.go @@ -11,6 +11,7 @@ import ( "github.com/nsfisis/iosdc-japan-2024-albatross/backend/api" "github.com/nsfisis/iosdc-japan-2024-albatross/backend/db" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/taskqueue" ) type playerClientState int @@ -25,6 +26,7 @@ type gameHub struct { ctx context.Context game *game q *db.Queries + taskQueue *taskqueue.Queue players map[*playerClient]playerClientState registerPlayer chan *playerClient unregisterPlayer chan *playerClient @@ -34,11 +36,12 @@ type gameHub struct { unregisterWatcher chan *watcherClient } -func newGameHub(ctx context.Context, game *game, q *db.Queries) *gameHub { +func newGameHub(ctx context.Context, game *game, q *db.Queries, taskQueue *taskqueue.Queue) *gameHub { return &gameHub{ ctx: ctx, game: game, q: q, + taskQueue: taskQueue, players: make(map[*playerClient]playerClientState), registerPlayer: make(chan *playerClient), unregisterPlayer: make(chan *playerClient), @@ -258,14 +261,16 @@ func (hub *gameHub) closeWatcherClient(watcher *watcherClient) { } type GameHubs struct { - hubs map[int]*gameHub - q *db.Queries + hubs map[int]*gameHub + q *db.Queries + taskQueue *taskqueue.Queue } -func NewGameHubs(q *db.Queries) *GameHubs { +func NewGameHubs(q *db.Queries, taskQueue *taskqueue.Queue) *GameHubs { return &GameHubs{ - hubs: make(map[int]*gameHub), - q: q, + hubs: make(map[int]*gameHub), + q: q, + taskQueue: taskQueue, } } @@ -313,7 +318,7 @@ func (hubs *GameHubs) RestoreFromDB(ctx context.Context) error { startedAt: startedAt, problem: problem_, playerCount: len(playerRows), - }, hubs.q) + }, hubs.q, hubs.taskQueue) } return nil } -- cgit v1.2.3-70-g09d2 From 1325626397703567828a903a82fc1ed8626dbad4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 5 Aug 2024 04:39:51 +0900 Subject: feat(backend): enqueue exec task when players submit their code --- backend/game/hub.go | 8 ++++++-- backend/taskqueue/tasks.go | 17 +++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'backend/game/hub.go') diff --git a/backend/game/hub.go b/backend/game/hub.go index a44bce0..0b12ce9 100644 --- a/backend/game/hub.go +++ b/backend/game/hub.go @@ -176,8 +176,12 @@ func (hub *gameHub) run() { case *playerMessageC2SSubmit: // TODO: assert game state is gaming log.Printf("submit: %v", message.message) - // code := msg.Data.Code - // TODO + code := msg.Data.Code + task, err := taskqueue.NewExecTask(hub.game.gameID, message.client.playerID, code) + if err != nil { + log.Fatalf("failed to create task: %v", err) + } + hub.taskQueue.Enqueue(task) default: log.Printf("unexpected message type: %T", message.message) } diff --git a/backend/taskqueue/tasks.go b/backend/taskqueue/tasks.go index 2891a36..cd67948 100644 --- a/backend/taskqueue/tasks.go +++ b/backend/taskqueue/tasks.go @@ -10,20 +10,17 @@ const ( TaskTypeExec = "exec" ) -type Testcase struct { - Stdin string - Stdout string -} - type TaskExecPlayload struct { - Code string - Testcases []*Testcase + GameID int + UserID int + Code string } -func NewExecTask(code string, testcases []*Testcase) (*asynq.Task, error) { +func NewExecTask(gameID, userID int, code string) (*asynq.Task, error) { payload, err := json.Marshal(TaskExecPlayload{ - Code: code, - Testcases: testcases, + GameID: gameID, + UserID: userID, + Code: code, }) if err != nil { return nil, err -- cgit v1.2.3-70-g09d2 From dc16e903999af89d87364ad6619e7c8b41301da4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 5 Aug 2024 05:35:37 +0900 Subject: feat: show execution result in play page --- backend/api/generated.go | 58 ++++++++++++---------- backend/game/hub.go | 16 ++++++ backend/main.go | 2 +- backend/taskqueue/processor.go | 8 ++- backend/taskqueue/worker_server.go | 7 ++- frontend/app/.server/api/schema.d.ts | 2 +- frontend/app/components/GolfPlayApp.client.tsx | 6 ++- .../components/GolfPlayApps/GolfPlayAppGaming.tsx | 5 +- openapi.yaml | 5 ++ 9 files changed, 76 insertions(+), 33 deletions(-) (limited to 'backend/game/hub.go') diff --git a/backend/api/generated.go b/backend/api/generated.go index e371c7d..3c52f84 100644 --- a/backend/api/generated.go +++ b/backend/api/generated.go @@ -41,7 +41,12 @@ const ( // Defines values for GamePlayerMessageS2CExecResultPayloadStatus. const ( - GamePlayerMessageS2CExecResultPayloadStatusSuccess GamePlayerMessageS2CExecResultPayloadStatus = "success" + GamePlayerMessageS2CExecResultPayloadStatusCompileError GamePlayerMessageS2CExecResultPayloadStatus = "compile_error" + GamePlayerMessageS2CExecResultPayloadStatusFailure GamePlayerMessageS2CExecResultPayloadStatus = "failure" + GamePlayerMessageS2CExecResultPayloadStatusInternalError GamePlayerMessageS2CExecResultPayloadStatus = "internal_error" + GamePlayerMessageS2CExecResultPayloadStatusSuccess GamePlayerMessageS2CExecResultPayloadStatus = "success" + GamePlayerMessageS2CExecResultPayloadStatusTimeout GamePlayerMessageS2CExecResultPayloadStatus = "timeout" + GamePlayerMessageS2CExecResultPayloadStatusWrongAnswer GamePlayerMessageS2CExecResultPayloadStatus = "wrong_answer" ) // Defines values for GameWatcherMessageS2CExecResultPayloadStatus. @@ -1101,31 +1106,32 @@ func (sh *strictHandler) GetToken(ctx echo.Context, params GetTokenParams) error // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", - "5c8RuYXQw9qcZwBmWZb9GwAA//9z5sw+kyEAAA==", + "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", + "G+PQ1yEAAA==", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/backend/game/hub.go b/backend/game/hub.go index 0b12ce9..bb82170 100644 --- a/backend/game/hub.go +++ b/backend/game/hub.go @@ -34,6 +34,7 @@ type gameHub struct { watchers map[*watcherClient]bool registerWatcher chan *watcherClient unregisterWatcher chan *watcherClient + testcaseExecution chan string } func newGameHub(ctx context.Context, game *game, q *db.Queries, taskQueue *taskqueue.Queue) *gameHub { @@ -49,6 +50,7 @@ func newGameHub(ctx context.Context, game *game, q *db.Queries, taskQueue *taskq watchers: make(map[*watcherClient]bool), registerWatcher: make(chan *watcherClient), unregisterWatcher: make(chan *watcherClient), + testcaseExecution: make(chan string), } } @@ -185,6 +187,16 @@ func (hub *gameHub) run() { default: log.Printf("unexpected message type: %T", message.message) } + case executionStatus := <-hub.testcaseExecution: + for player := range hub.players { + player.s2cMessages <- &playerMessageS2CExecResult{ + Type: playerMessageTypeS2CExecResult, + Data: playerMessageS2CExecResultPayload{ + Score: nil, + Status: api.GamePlayerMessageS2CExecResultPayloadStatus(executionStatus), + }, + } + } case <-ticker.C: if hub.game.state == gameStateStarting { if time.Now().After(*hub.game.startedAt) { @@ -344,3 +356,7 @@ func (hubs *GameHubs) StartGame(gameID int) error { } return hub.startGame() } + +func (hubs *GameHubs) C() chan string { + return hubs.hubs[4].testcaseExecution +} diff --git a/backend/main.go b/backend/main.go index 7cfbe2f..e3d0052 100644 --- a/backend/main.go +++ b/backend/main.go @@ -61,7 +61,6 @@ func main() { e.Use(middleware.Recover()) taskQueue := taskqueue.NewQueue("task-db:6379") - workerServer := taskqueue.NewWorkerServer("task-db:6379", queries) gameHubs := game.NewGameHubs(queries, taskQueue) err = gameHubs.RestoreFromDB(ctx) @@ -98,6 +97,7 @@ func main() { gameHubs.Run() + workerServer := taskqueue.NewWorkerServer("task-db:6379", queries, gameHubs.C()) go func() { workerServer.Run() }() diff --git a/backend/taskqueue/processor.go b/backend/taskqueue/processor.go index 1105da5..e505c5a 100644 --- a/backend/taskqueue/processor.go +++ b/backend/taskqueue/processor.go @@ -15,11 +15,13 @@ import ( type ExecProcessor struct { q *db.Queries + c chan string } -func NewExecProcessor(q *db.Queries) *ExecProcessor { +func NewExecProcessor(q *db.Queries, c chan string) *ExecProcessor { return &ExecProcessor{ q: q, + c: c, } } @@ -78,6 +80,7 @@ func (p *ExecProcessor) ProcessTask(ctx context.Context, t *asynq.Task) error { if err != nil { return fmt.Errorf("CreateTestcaseExecution failed: %v", err) } + p.c <- "compile_error" return fmt.Errorf("swiftc failed: %v", resData.Stderr) } } @@ -118,6 +121,7 @@ func (p *ExecProcessor) ProcessTask(ctx context.Context, t *asynq.Task) error { if err != nil { return fmt.Errorf("CreateTestcaseExecution failed: %v", err) } + p.c <- "compile_error" return fmt.Errorf("wasmc failed: %v", resData.Stderr) } } @@ -166,6 +170,7 @@ func (p *ExecProcessor) ProcessTask(ctx context.Context, t *asynq.Task) error { if err != nil { return fmt.Errorf("CreateTestcaseExecution failed: %v", err) } + p.c <- resData.Result return fmt.Errorf("testrun failed: %v", resData.Stderr) } if isTestcaseExecutionCorrect(testcase.Stdout, resData.Stdout) { @@ -179,6 +184,7 @@ func (p *ExecProcessor) ProcessTask(ctx context.Context, t *asynq.Task) error { if err != nil { return fmt.Errorf("CreateTestcaseExecution failed: %v", err) } + p.c <- "wrong_answer" return fmt.Errorf("testrun failed: %v", resData.Stdout) } } diff --git a/backend/taskqueue/worker_server.go b/backend/taskqueue/worker_server.go index 09d9761..485d6d3 100644 --- a/backend/taskqueue/worker_server.go +++ b/backend/taskqueue/worker_server.go @@ -9,9 +9,10 @@ import ( type WorkerServer struct { server *asynq.Server queries *db.Queries + c chan string } -func NewWorkerServer(redisAddr string, queries *db.Queries) *WorkerServer { +func NewWorkerServer(redisAddr string, queries *db.Queries, c chan string) *WorkerServer { return &WorkerServer{ server: asynq.NewServer( asynq.RedisClientOpt{ @@ -19,12 +20,14 @@ func NewWorkerServer(redisAddr string, queries *db.Queries) *WorkerServer { }, asynq.Config{}, ), + queries: queries, + c: c, } } func (s *WorkerServer) Run() error { mux := asynq.NewServeMux() - mux.Handle(TaskTypeExec, NewExecProcessor(s.queries)) + mux.Handle(TaskTypeExec, NewExecProcessor(s.queries, s.c)) return s.server.Run(mux) } diff --git a/frontend/app/.server/api/schema.d.ts b/frontend/app/.server/api/schema.d.ts index 62badcf..6981dea 100644 --- a/frontend/app/.server/api/schema.d.ts +++ b/frontend/app/.server/api/schema.d.ts @@ -150,7 +150,7 @@ export interface components { * @example success * @enum {string} */ - status: "success"; + status: "success" | "failure" | "timeout" | "internal_error" | "compile_error" | "wrong_answer"; /** @example 100 */ score: number | null; }; diff --git a/frontend/app/components/GolfPlayApp.client.tsx b/frontend/app/components/GolfPlayApp.client.tsx index 80e7182..911fae0 100644 --- a/frontend/app/components/GolfPlayApp.client.tsx +++ b/frontend/app/components/GolfPlayApp.client.tsx @@ -73,6 +73,8 @@ export default function GolfPlayApp({ const [currentScore, setCurrentScore] = useState(null); + const [lastExecStatus, setLastExecStatus] = useState(null); + const onCodeChange = useDebouncedCallback((code: string) => { console.log("player:c2s:code"); sendJsonMessage({ @@ -121,13 +123,14 @@ export default function GolfPlayApp({ setGameState("starting"); } } else if (lastJsonMessage.type === "player:s2c:execresult") { - const { score } = lastJsonMessage.data; + const { status, score } = lastJsonMessage.data; if ( score !== null && (currentScore === null || score < currentScore) ) { setCurrentScore(score); } + setLastExecStatus(status); } } else { setGameState("waiting"); @@ -150,6 +153,7 @@ export default function GolfPlayApp({ onCodeChange={onCodeChange} onCodeSubmit={onCodeSubmit} currentScore={currentScore} + lastExecStatus={lastExecStatus} /> ); } else if (gameState === "finished") { diff --git a/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx b/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx index 9fddb01..1a08b98 100644 --- a/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx +++ b/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx @@ -5,6 +5,7 @@ type Props = { onCodeChange: (code: string) => void; onCodeSubmit: (code: string) => void; currentScore: number | null; + lastExecStatus: string | null; }; export default function GolfPlayAppGaming({ @@ -12,6 +13,7 @@ export default function GolfPlayAppGaming({ onCodeChange, onCodeSubmit, currentScore, + lastExecStatus, }: Props) { const textareaRef = useRef(null); @@ -36,7 +38,8 @@ export default function GolfPlayAppGaming({
- Score: {currentScore == null ? "-" : `${currentScore}`} + Score: {currentScore == null ? "-" : `${currentScore}`} ( + {lastExecStatus})