From 3385118b1406d39f859ea6cff60a378b4a41735a Mon Sep 17 00:00:00 2001 From: Lett Osprey Date: Fri, 10 Apr 2026 19:36:28 +0200 Subject: [PATCH] More massive workstuff for completion :P --- api-test/run.sh | 7 +- api-test/{ => test-files}/api-test.sh | 0 api-test/{ => test-files}/docker-down.sh | 0 api-test/{ => test-files}/docker-up.sh | 0 api-test/{ => test-files}/test.json | 0 client/src/client.gleam | 117 +++--------------- client/src/model.gleam | 11 +- client/src/shared.gleam | 16 --- client/src/view.gleam | 79 ++++++------ server/priv/static/layout.css | 8 ++ server/priv/static/root.html | 48 -------- server/src/backend/playerhandler.gleam | 47 ++++++-- server/src/backend/roomhandler.gleam | 51 +++++--- server/src/backend/sockethandler.gleam | 8 +- server/src/quizterm.gleam | 1 - server/src/shared/message.gleam | 19 ++- server/src/web/components/answerlist.gleam | 8 +- server/src/web/components/shared.gleam | 13 ++ server/src/web/handlers/serve.gleam | 132 +++++++++++---------- server/src/web/router.gleam | 114 +++++++++++------- 20 files changed, 325 insertions(+), 354 deletions(-) rename api-test/{ => test-files}/api-test.sh (100%) rename api-test/{ => test-files}/docker-down.sh (100%) rename api-test/{ => test-files}/docker-up.sh (100%) rename api-test/{ => test-files}/test.json (100%) delete mode 100644 client/src/shared.gleam delete mode 100644 server/priv/static/root.html diff --git a/api-test/run.sh b/api-test/run.sh index a22777e..ea22639 100644 --- a/api-test/run.sh +++ b/api-test/run.sh @@ -1,3 +1,4 @@ -sh docker-up -sh api-test -sh docker-down +echo "Tests not updated after rewrite, commented out until this is fixed" +#sh test-files/docker-up +#sh test-files/api-test +#sh test-files/docker-down diff --git a/api-test/api-test.sh b/api-test/test-files/api-test.sh similarity index 100% rename from api-test/api-test.sh rename to api-test/test-files/api-test.sh diff --git a/api-test/docker-down.sh b/api-test/test-files/docker-down.sh similarity index 100% rename from api-test/docker-down.sh rename to api-test/test-files/docker-down.sh diff --git a/api-test/docker-up.sh b/api-test/test-files/docker-up.sh similarity index 100% rename from api-test/docker-up.sh rename to api-test/test-files/docker-up.sh diff --git a/api-test/test.json b/api-test/test-files/test.json similarity index 100% rename from api-test/test.json rename to api-test/test-files/test.json diff --git a/client/src/client.gleam b/client/src/client.gleam index f38ea9d..357bdde 100644 --- a/client/src/client.gleam +++ b/client/src/client.gleam @@ -1,27 +1,30 @@ import gleam/dynamic/decode import gleam/json -import gleam/list import gleam/option.{type Option, None, Some} import gleam/result import gleam/string import lustre import lustre/effect.{type Effect} import model.{ - type Model, type Msg, AwaitPlayers, Empty, EnterPin, Initialize, KeyPin, Model, - PickPlayer, Players, SelectedGamestyle, SelectedPlayer, SelectedRoom, + type Model, type Msg, type Room, Empty, EnterPin, Initialize, KeyPin, Model, + Room, SelectedGamestyle, SelectedRoom, } import plinth/browser/document import plinth/browser/element as plinth_element -import rsvp -import shared.{type Room} import view.{view} pub fn main() { + let room_decoder = { + use name <- decode.field("name", decode.string) + use id <- decode.field("id", decode.string) + use pin <- decode.field("key", decode.string) + decode.success(Room(id:, name:, pin:)) + } let initial_items = document.query_selector("#model") |> result.map(plinth_element.inner_text) |> result.try(fn(json) { - json.parse(json, shared.grocery_list_decoder()) + json.parse(json, decode.list(room_decoder)) |> result.replace_error(Nil) }) |> result.unwrap([]) @@ -47,14 +50,6 @@ fn update(model: Model, msg: Msg) -> #(Model, Effect(Msg)) { effect.none(), ) KeyPin(pin) -> { - //let _decode_answer = { - // use id <- decode.field("id", decode.string) - // use text <- decode.field("text", decode.string) - // decode.success(id) - // } - // let decode_list = { - // decode.list(decode.string) - // } case model.state { EnterPin(room, _) -> #( Model(..model, state: case string.length(pin) < 4 { @@ -72,97 +67,21 @@ fn update(model: Model, msg: Msg) -> #(Model, Effect(Msg)) { } SelectedGamestyle(style) -> { case model.state { - model.SelectGamestyle(room:, pin:) -> #( - Model(..model, state: case style { - "Single Game" -> - PickPlayer(room:, pin:, players: [ - "Player a", - "Player b", - "Player c", - "Player d", - "Player e", - "Player f", - ]) - _ -> model.JoinLive(room:, pin:) - }), - effect.none(), - ) + model.SelectGamestyle(room:, pin:) -> { + #( + Model(..model, state: case style { + "Single Game" -> model.JoinSingle(room:, pin:) + _ -> model.JoinLive(room:, pin:) + }), + effect.none(), + ) + } _ -> init(#( model.rooms, Some("(fail: selectgamestyle) Invalid state, starting over"), )) } - // Model(..model, state: AwaitPlayers(room:, pin:)), - // rsvp.post( - // "http://localhost:1234/api/room/players", - // json.object([#("id", json.string("1234"))]), - // rsvp.expect_json(decode_answer, Players), - // ), - // ) } - Players(Ok(players)) -> { - echo "got players" - case model.state { - AwaitPlayers(room:, pin:) -> #( - Model(..model, state: PickPlayer(room:, pin:, players: [players])), - effect.none(), - ) - _ -> - init(#( - model.rooms, - Some("(fail: awaitplayers) Invalid state, starting over"), - )) - } - } - Players(Error(x)) -> - init(#( - model.rooms, - Some("Error fetching players " <> decode_rsvp_error(x)), - )) - SelectedPlayer(player) -> - case model.state { - PickPlayer(room:, pin:, players: _) -> #( - Model(..model, state: model.JoinSingle(room:, pin:, player:)), - effect.none(), - ) - _ -> - init(#( - model.rooms, - Some("(fail: pickplayer) Invalid state, starting over"), - )) - } - } -} - -fn decode_rsvp_error(rsvp_error: rsvp.Error) { - case rsvp_error { - rsvp.BadBody -> "Bad body" - rsvp.BadUrl(_x) -> "Bad url" - rsvp.HttpError(_x) -> "Http error" - rsvp.JsonError(x) -> "Json error" <> decode_decode_error(x) - rsvp.NetworkError -> "Network error" - rsvp.UnhandledResponse(_) -> "Unhandled response" - } -} - -fn decode_decode_error(json_error: json.DecodeError) -> String { - case json_error { - json.UnableToDecode(x) -> - "[unable to decode" - <> string.concat( - list.map(x, fn(x) { "(" <> decode_ddecode_error(x) <> ")" }), - ) - <> "]" - json.UnexpectedSequence(s) -> "[unexpected sequence " <> s <> "]" - json.UnexpectedByte(x) -> "[unexpected byte " <> x <> "]" - json.UnexpectedEndOfInput -> "[unexpected end of input]" - } -} - -fn decode_ddecode_error(decode_error: decode.DecodeError) -> String { - case decode_error { - decode.DecodeError(expected:, found:, path:) -> - "(e: " <> expected <> ", f: " <> found <> ", p: " <> string.concat(path) } } diff --git a/client/src/model.gleam b/client/src/model.gleam index 3a03594..e82dc03 100644 --- a/client/src/model.gleam +++ b/client/src/model.gleam @@ -1,6 +1,5 @@ import gleam/option.{type Option} import rsvp.{type Error} -import shared.{type Room} pub type Model { Model(rooms: List(Room), state: State, ohno: Option(String)) @@ -10,17 +9,17 @@ pub type State { Empty EnterPin(room: String, pin: String) SelectGamestyle(room: String, pin: String) - AwaitPlayers(room: String, pin: String) - PickPlayer(room: String, pin: String, players: List(String)) JoinLive(room: String, pin: String) - JoinSingle(room: String, pin: String, player: String) + JoinSingle(room: String, pin: String) } pub type Msg { Initialize SelectedRoom(String) - SelectedPlayer(String) SelectedGamestyle(String) KeyPin(String) - Players(Result(String, Error)) +} + +pub type Room { + Room(id: String, name: String, pin: String) } diff --git a/client/src/shared.gleam b/client/src/shared.gleam deleted file mode 100644 index 7f27196..0000000 --- a/client/src/shared.gleam +++ /dev/null @@ -1,16 +0,0 @@ -import gleam/dynamic/decode - -pub type Room { - Room(id: String, name: String, pin: String) -} - - -pub fn grocery_list_decoder() -> decode.Decoder(List(Room)) { - let room_decoder = { - use name <- decode.field("name", decode.string) - use id <- decode.field("id", decode.string) - use pin <- decode.field("key", decode.string) - decode.success(Room(id:, name:, pin: )) - } - decode.list(room_decoder) -} diff --git a/client/src/view.gleam b/client/src/view.gleam index 35f6ef4..a12038a 100644 --- a/client/src/view.gleam +++ b/client/src/view.gleam @@ -7,20 +7,17 @@ import lustre/element/html import lustre/event import lustre/server_component import model.{ - type Model, type Msg, AwaitPlayers, Empty, EnterPin, JoinLive, JoinSingle, - KeyPin, PickPlayer, SelectGamestyle, SelectedPlayer, SelectedRoom, + type Model, type Msg, type Room, Empty, EnterPin, JoinLive, JoinSingle, KeyPin, + SelectGamestyle, SelectedRoom, } -import shared.{type Room} pub fn view(model: Model) -> Element(Msg) { case model.state { Empty -> view_room_list(model.rooms) EnterPin(_, _) -> view_enter_pin() SelectGamestyle(_, _) -> view_live_or_single() - AwaitPlayers(_, _) -> html.text("FETCHING USERS FOR ROOM") - PickPlayer(_, _, players) -> view_player_list(players) JoinLive(room:, pin:) -> view_join_live(room, pin) - JoinSingle(room:, pin:, player:) -> view_join_single(room, pin, player) + JoinSingle(room:, pin:) -> view_join_single(room, pin) } } @@ -65,38 +62,28 @@ fn view_room_list(items: List(Room)) -> Element(Msg) { fn view_enter_pin() -> Element(Msg) { layout("Enter PIN code for room", None, [ - html.input([ - attribute.type_("password"), - event.on_input(KeyPin), - attribute.autofocus(True), - ]), + input_cell("[#ENTER PIN]", True, KeyPin), ]) } fn view_join_live(room: String, pin: String) -> Element(Msg) { - html.div([attribute.class("terminal-section")], [ - html.div([attribute.class("terminal-label mb-4")], [ - server_component.element( - [server_component.route("/socket/live/" <> room)], - [], - ), - server_component.element( - [server_component.route("/socket/control/" <> room)], - [], - ), - ]), + element.fragment([ + server_component.element( + [server_component.route("/socket/live/" <> room)], + [], + ), + server_component.element( + [server_component.route("/socket/control/" <> room)], + [], + ), ]) } -fn view_join_single(room: String, pin: String, player: String) -> Element(Msg) { - html.div([attribute.class("terminal-section")], [ - html.div([attribute.class("terminal-label mb-4")], [ - server_component.element( - [server_component.route("/socket/single/" <> room)], - [], - ), - ]), - ]) +fn view_join_single(room: String, pin: String) -> Element(Msg) { + server_component.element( + [server_component.route("/socket/single/" <> room)], + [], + ) } fn view_live_or_single() -> Element(Msg) { @@ -106,15 +93,27 @@ fn view_live_or_single() -> Element(Msg) { ]) } -fn view_player_list(items: List(String)) -> Element(Msg) { - layout("Select or enter your player", None, case items { - [] -> [html.text("No items in your list yet.")] - _ -> { - list.index_map(items, fn(item, index) { - click_cell(index, item, SelectedPlayer) - }) - } - }) + +fn input_cell( + header: String, + password: Bool, + on_input: fn(String) -> Msg, +) -> Element(Msg) { + html.div([class("participant-login")], [ + html.div([class("participant-name")], [ + html.text("► " <> header), + html.div([], [ + html.input([ + attribute.type_(case password { + True -> "password" + False -> "text" + }), + event.on_input(on_input), + attribute.autofocus(True), + ]), + ]), + ]), + ]) } fn click_cell( diff --git a/server/priv/static/layout.css b/server/priv/static/layout.css index 1baa22e..4b04b8f 100644 --- a/server/priv/static/layout.css +++ b/server/priv/static/layout.css @@ -115,6 +115,14 @@ body { margin: 0 auto; } +.singles-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(590px, 1fr)); + gap: 1rem; + max-width: 1200px; + margin: 0 auto; +} + .participant-box { border: 2px solid #00ff00; padding: 1rem; diff --git a/server/priv/static/root.html b/server/priv/static/root.html deleted file mode 100644 index c0443ea..0000000 --- a/server/priv/static/root.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - QUIZTERMINAL v1.0 - - - - - - -
-
-
- 
-╔═══════════════════════════════════════╗
-║       Q U I Z T E R M I N A L         ║
-╚═══════════════════════════════════════╝
-
-
-
-
-
- - diff --git a/server/src/backend/playerhandler.gleam b/server/src/backend/playerhandler.gleam index 1e02e30..8ab815b 100644 --- a/server/src/backend/playerhandler.gleam +++ b/server/src/backend/playerhandler.gleam @@ -14,8 +14,8 @@ import shared/message.{ type State { State( question_number: Int, - // int in #pair: answer number - slow_answers: List(#(String, List(#(Int, String)))), + // id, (name (question#, answer_attempt) + slow_answers: List(#(String, #(String, List(#(Int, String))))), // int in #pair: ping counted since response back. name_answers: List(#(String, #(Int, AnswerStatus))), hide_answers: Bool, @@ -66,19 +66,19 @@ pub fn initialize( GiveAnswer(name, answer) -> give_answer(state, registry, name, answer) // A player has answered a question in "single" game. Register the answer. - GiveSingleAnswer(name, question, answer) -> { + GiveSingleAnswer(id, question, answer) -> { State( ..state, - slow_answers: case list.key_find(state.slow_answers, name) { - Ok(l) -> { - list.key_set( - state.slow_answers, + slow_answers: case list.key_find(state.slow_answers, id) { + Ok(value) -> { + let #(name, list) = value + list.key_set(state.slow_answers, id, #( name, - list.key_set(l, question, answer), - ) + list.key_set(list, question, answer), + )) } Error(_) -> { - list.key_set(state.slow_answers, name, [#(question, answer)]) + state.slow_answers } }, ) @@ -88,12 +88,37 @@ pub fn initialize( // Switch from "Wait for next question" to "Answer next question" mode AnswerQuiz -> answer_quiz(state, registry) + message.FetchPlayers(subject:) -> { + fetch_players(state.slow_answers, subject) + state + } + message.AddPlayer(name:, subject:) -> { + let _ = add_player(name, subject) + state + } } |> actor.continue() }) |> actor.start } +fn add_player(_name: String, _subject: Subject(Result(String, String))) { + #(200, "ok", "ok") +} + +fn fetch_players( + players: List(#(String, #(String, List(#(Int, String))))), + subject: Subject(List(#(String, String))), +) { + actor.send( + subject, + list.map(players, fn(player) { + let #(id, #(name, _)) = player + #(id, name) + }), + ) +} + // Reschedule a new ping request, and ask clients to ping us back fn ping(state, registry, sender) { broadcast(registry, message.Ping) @@ -218,7 +243,7 @@ fn combine_lists(state: State) { // Second list require a bit more work Iterate over each payers answers, // creating user objects where question number match current question number. list.flat_map(state.slow_answers, fn(name_answers) { - let #(name, answers) = name_answers + let #(_, #(name, answers)) = name_answers list.filter_map(answers, fn(number_answer) { let #(answer_number, answer) = number_answer case state.question_number == answer_number { diff --git a/server/src/backend/roomhandler.gleam b/server/src/backend/roomhandler.gleam index 7bbe140..645ab7a 100644 --- a/server/src/backend/roomhandler.gleam +++ b/server/src/backend/roomhandler.gleam @@ -4,25 +4,29 @@ import gleam/list import gleam/option.{Some} import gleam/otp/actor.{type Started} import group_registry -import shared/message.{type ClientsServer, type RoomControl, type StateControl} +import shared/message.{ + type Room, type RoomControl, type StateControl, CreateRoom, FetchRoom, + FetchRooms, PingTime, Room, RoomInfo, +} // Room handler, actor to hold the rooms for the different teams playing. // // Reacts to: -// CreateRoom(id) - create room with given ID. +// CreateRoom(id, name, pin_enc) - create room with given ID, name and encoded pin // // Responds to: // FetchRoom(id, ) - Fetch room with the given id. +// FetchRooms() - Fetch list of rooms. -type Room { - Room(questions: List(#(Int, String)), rooms: List(#(String, ClientsServer))) +type Rooms { + Rooms(rooms: List(#(String, Room))) } pub fn initialize(state_handler: Started(Subject(StateControl))) { - actor.new(Room([], [])) - |> actor.on_message(fn(state: Room, message: RoomControl(ClientsServer)) { + actor.new(Rooms([])) + |> actor.on_message(fn(state: Rooms, message: RoomControl) { case message { - message.CreateRoom(id:) -> { + CreateRoom(id:, room: RoomInfo(name, pin_enc)) -> { case // Does room already exist? state.rooms |> list.key_find(id) @@ -32,17 +36,18 @@ pub fn initialize(state_handler: Started(Subject(StateControl))) { case list.length(state.rooms) < 50 { True -> { // Room not found (not really an error case), create it. - let name = process.new_name("quiz-registry" <> id) let assert Ok(actor.Started(data: registry, ..)) = - group_registry.start(name) + group_registry.start(process.new_name("quiz-registry" <> id)) let assert Ok(actor) = player_handler.initialize(state_handler, registry) - process.send_after( - actor.data, - 1000, - message.PingTime(actor.data), - ) - Room(..state, rooms: [#(id, #(registry, actor)), ..state.rooms]) + process.send_after(actor.data, 1000, PingTime(actor.data)) + Rooms(rooms: [ + #( + id, + Room(pin_enc: pin_enc, name:, actors: #(registry, actor)), + ), + ..state.rooms + ]) } False -> state } @@ -51,16 +56,26 @@ pub fn initialize(state_handler: Started(Subject(StateControl))) { Ok(_) -> state } } - message.FetchRoom(id:, subject:) -> { + FetchRoom(id:, subject:) -> { case // Find the room, if it exists state.rooms |> list.key_find(id) { - Ok(room) -> actor.send(subject, Some(room)) - Error(_) -> actor.send(subject, option.None) + Ok(Room(_, _, actors)) -> actor.send(subject, Some(actors)) + _ -> actor.send(subject, option.None) } state } + FetchRooms(subject:) -> { + // Transform from Room to RoomInfo and ship back + state.rooms + |> list.map(fn(id_room) { + let #(id, Room(name, pin_enc, _)) = id_room + #(id, message.RoomInfo(name:, pin_enc:)) + }) + |> actor.send(subject, _) + state + } } |> actor.continue() }) diff --git a/server/src/backend/sockethandler.gleam b/server/src/backend/sockethandler.gleam index 335d3f2..a6db770 100644 --- a/server/src/backend/sockethandler.gleam +++ b/server/src/backend/sockethandler.gleam @@ -12,9 +12,9 @@ import shared/message pub fn serve( request: Request(Connection), - component: lustre.App(start_args, model, msg), + component: lustre.App(message.ClientsServer, model, msg), id: String, - actor: actor.Started(Subject(message.RoomControl(start_args))), + actor: actor.Started(Subject(message.RoomControl)), ) -> Response(ResponseData) { let start_args = actor.call(actor.data, 1000, message.FetchRoom(id, _)) case start_args { @@ -35,9 +35,9 @@ pub fn serve( pub fn serve_slow( request: Request(Connection), - component: lustre.App(#(List(#(Int, String)), start_args), model, msg), + component: lustre.App(#(List(#(Int, String)), message.ClientsServer), model, msg), id: String, - roomhandler: actor.Started(Subject(message.RoomControl(start_args))), + roomhandler: actor.Started(Subject(message.RoomControl)), statehandler: actor.Started(Subject(message.StateControl)), ) -> Response(ResponseData) { let start_args_opt = diff --git a/server/src/quizterm.gleam b/server/src/quizterm.gleam index 283a38c..f8e4388 100644 --- a/server/src/quizterm.gleam +++ b/server/src/quizterm.gleam @@ -35,7 +35,6 @@ pub fn main() { _ -> case request.path_segments(req) { ["lustre", "runtime.mjs"] -> serve_runtime() - [] | ["index.html"] -> serve_static("root.html") ["client.js"] -> serve_static("client.js") ["static", file] -> serve_static(file) ["socket", "live", id] -> diff --git a/server/src/shared/message.gleam b/server/src/shared/message.gleam index 3a6bb11..9035c35 100644 --- a/server/src/shared/message.gleam +++ b/server/src/shared/message.gleam @@ -14,7 +14,9 @@ pub type NotifyServer { PurgePlayers GiveName(name: String) GiveAnswer(name: String, answer: Option(String)) - GiveSingleAnswer(name: String, question: Int, answer: String) + GiveSingleAnswer(id: String, question: Int, answer: String) + FetchPlayers(subject: Subject(List(#(String, String)))) + AddPlayer(name: String, subject: Subject(Result(String, String))) } pub type StateControl { @@ -25,9 +27,18 @@ pub type StateControl { FetchQuestions(subject: Subject(List(#(Int, String)))) } -pub type RoomControl(msg) { - CreateRoom(id: String) - FetchRoom(id: String, subject: Subject(Option(msg))) +pub type Room { + Room(name: String, pin_enc: String, actors: ClientsServer) +} + +pub type RoomInfo { + RoomInfo(name: String, pin_enc: String) +} + +pub type RoomControl { + CreateRoom(id: String, room: RoomInfo) + FetchRoom(id: String, subject: Subject(Option(ClientsServer))) + FetchRooms(subject: Subject(List(#(String, RoomInfo)))) } pub type AnswerStatus { diff --git a/server/src/web/components/answerlist.gleam b/server/src/web/components/answerlist.gleam index 78adcfd..2674ace 100644 --- a/server/src/web/components/answerlist.gleam +++ b/server/src/web/components/answerlist.gleam @@ -78,10 +78,10 @@ fn update(model: Model, msg: Msg) -> #(Model, Effect(Msg)) { effect.none(), ) } - GiveAnswer(name, question, answer) -> { + GiveAnswer(id, question, answer) -> { actor.send( model.handler.data, - message.GiveSingleAnswer(name:, question:, answer:), + message.GiveSingleAnswer(id:, question:, answer:), ) let new_value = case list.key_find(model.answers, question) { Ok(pair) -> { @@ -93,7 +93,7 @@ fn update(model: Model, msg: Msg) -> #(Model, Effect(Msg)) { #( Model( ..model, - state: GiveQuestion(name, ""), + state: GiveQuestion(id, ""), answers: list.key_set(model.answers, question, new_value), ), effect.none(), @@ -160,7 +160,7 @@ fn terminal_section( html.div([attribute.class("terminal-label mb-4")], [ html.text(header), ]), - html.div([attribute.class("participants-grid")], list.map(answers, extract)), + html.div([attribute.class("singles-grid")], list.map(answers, extract)), ]) } diff --git a/server/src/web/components/shared.gleam b/server/src/web/components/shared.gleam index 4177701..df7be00 100644 --- a/server/src/web/components/shared.gleam +++ b/server/src/web/components/shared.gleam @@ -102,3 +102,16 @@ pub fn step_prompt(text: String, fetch: fn() -> Element(a)) { ]), ]) } +//fn xiew_player_list(items: List(String)) -> Element(Msg) { +// layout("Select or enter your player", None, case items { +// [] -> [html.text("No items in your list yet.")] +// _ -> { +// list.append( +// list.index_map(items, fn(item, index) { +// click_cell(index, item, SelectedPlayer) +// }), +// [input_cell("[#NEW PLAYER]", False, KeyPin)], +// ) +// } +// }) +// diff --git a/server/src/web/handlers/serve.gleam b/server/src/web/handlers/serve.gleam index 1a5cc57..cfaf725 100644 --- a/server/src/web/handlers/serve.gleam +++ b/server/src/web/handlers/serve.gleam @@ -1,18 +1,77 @@ -import gleam/erlang/process.{type Subject} -import gleam/json +import shared/message import gleam/int -import gleam/option.{None, Some} -import gleam/otp/actor.{type Started} +import gleam/json import lustre/attribute.{class} import lustre/element import lustre/element/html.{body, div, head, html, link, meta, script, title} -import lustre/server_component -import shared/message.{ - type ClientsServer, type RoomControl, CreateRoom, FetchRoom, -} import wisp.{type Response} -pub fn main_html(content: fn() -> element.Element(a)) -> Response { +pub fn main_html(rooms: List(#(String, message.RoomInfo))) -> Response { + html([], [ + head([], [ + meta([attribute.charset("utf-8")]), + meta([ + attribute.name("viewport"), + attribute.content("width=device-width, initial-scale=1.0"), + ]), + title([], "QUIZTERMINAL v1.0"), + script( + [attribute.type_("module"), attribute.src("/lustre/runtime.mjs")], + "", + ), + script([attribute.type_("module"), attribute.src("/client.js")], ""), + script( + [ + attribute.id("model"), + attribute.type_("application/json"), + attribute.src("/client.js"), + ], + + TODO: CREATE TEXT STRING FROM ROOM LIST! + " +[ +{ +\"id\": \"1234\", +\"name\": \"Team A\", +\"key\": \"1234\" +} +] +", + ), + link([ + attribute.rel("stylesheet"), + attribute.type_("text/css"), + attribute.href("/static/layout.css"), + ]), + ]), + body([], [ + div([class("terminal-screen")], [ + div([class("terminal-glow")], [ + div([class("scanlines")], []), + + // title + div([class("terminal-header")], [ + html.pre([class("terminal-title")], [ + html.text( + " +╔═══════════════════════════════════════╗ +║ Q U I Z T E R M I N A L ║ +╚═══════════════════════════════════════╝ +", + ), + ]), + ]), + html.div([attribute.id("app")], []), + ]), + ]), + ]), + ]) + |> element.to_document_string + |> wisp.html_response(200) +} + +// Todo: join with main_html +pub fn html_404() -> Response { html([], [ head([], [ meta([attribute.charset("utf-8")]), @@ -42,70 +101,23 @@ pub fn main_html(content: fn() -> element.Element(a)) -> Response { html.text( " ╔═══════════════════════════════════════╗ -║ Q U I Z T E R M I N A L ║ -╚═══════════════════════════════════════╝ +║ 4 0 4 ║ +╚═════════════════════════════════ohno!═╝ ", ), ]), ]), - // Insert content - content(), ]), ]), ]), ]) |> element.to_document_string - |> wisp.html_response(200) -} - -pub fn room(actor: Started(Subject(RoomControl(ClientsServer))), id: String) { - process.send(actor.data, CreateRoom(id)) - status_head("Created room with id " <> id) -} - -pub fn slow( - actor: Started(Subject(RoomControl(ClientsServer))), - id: String, -) -> fn() -> element.Element(a) { - let start_args = actor.call(actor.data, 1000, FetchRoom(id, _)) - case start_args { - Some(_) -> fn() { - div([], [ - server_component.element( - [server_component.route("/socket/slow/" <> id)], - [], - ), - ]) - } - None -> status_head("Could not find that room...") - } -} - -pub fn board( - actor: Started(Subject(RoomControl(ClientsServer))), - id: String, -) -> fn() -> element.Element(a) { - let start_args = actor.call(actor.data, 1000, FetchRoom(id, _)) - case start_args { - Some(_) -> fn() { - div([], [ - server_component.element( - [server_component.route("/socket/card/" <> id)], - [], - ), - server_component.element( - [server_component.route("/socket/control/" <> id)], - [], - ), - ]) - } - None -> status_head("Could not find that room...") - } + |> wisp.html_response(400) } pub fn create_json_response(response: #(Int, String, String)) { let #(code, message, output) = response - wisp.log_info("[api][" <>int.to_string(code)<>"][" <> message<> "]") + wisp.log_info("[api][" <> int.to_string(code) <> "][" <> message <> "]") json.object([#("response", json.string(output))]) |> json.to_string |> wisp.json_response(200) diff --git a/server/src/web/router.gleam b/server/src/web/router.gleam index 0641526..f0535e6 100644 --- a/server/src/web/router.gleam +++ b/server/src/web/router.gleam @@ -8,49 +8,54 @@ import gleam/json import gleam/list import gleam/option import gleam/otp/actor.{type Started} -import shared/message.{type ClientsServer, type RoomControl, type StateControl} -import web/handlers/serve.{board, main_html, room, slow, status_head} +import shared/message.{type RoomControl, type StateControl} +import web/handlers/serve.{html_404} import wisp.{type Request, type Response} pub fn handle_request( - room_handler: Started(Subject(RoomControl(ClientsServer))), + room_handler: Started(Subject(RoomControl)), state_handler: Started(Subject(StateControl)), req: Request, ) -> Response { use req <- middleware(req) case wisp.path_segments(req) { - ["api", "room", ..path] -> handle_room_api(room_handler, req, path) + [] | ["index.html"] -> serve.main_html(fetch_rooms(room_handler)) + ["api", "room"] -> handle_room(room_handler, req) + ["api", "room", id, ..path] -> handle_players(room_handler, req, id, path) ["api", ..path] -> handle_admin_api(state_handler, req, path) - _ -> handle_html(room_handler, req) + _ -> html_404() } } -fn handle_html( - actor: Started(Subject(RoomControl(ClientsServer))), - req: Request, -) -> Response { - case wisp.path_segments(req) { - ["slow", id] -> slow(actor, id) - ["board", id] -> board(actor, id) - ["room", id] -> room(actor, id) - _ -> { - wisp.log_info("No match for request") - status_head("Nothing to see here") - } +fn handle_room(room_handler: Started(Subject(RoomControl)), req: Request) { + use json <- wisp.require_json(req) + + case req.method { + http.Post -> add_room(room_handler, json) + _ -> #(404, "bad api path", "Resource not found") } - |> main_html + |> serve.create_json_response } -fn handle_room_api( - room_handler: Started(Subject(RoomControl(ClientsServer))), +fn handle_players( + room_handler: Started(Subject(RoomControl)), req: Request, + id: String, path: List(String), ) { use json <- wisp.require_json(req) - case req.method, path { - http.Post, ["players"] -> fetch_players(room_handler, json) - _, _ -> #(404, "bad api path", "Resource not found") + case actor.call(room_handler.data, 1000, message.FetchRoom(id, _)) { + option.Some(#(_, player_handler)) -> + case req.method, path { + http.Post, ["player"] -> add_player(player_handler, json) + _, _ -> #(404, "bad api path", "Resource not found") + } + option.None -> #( + 404, + "Room not found, or key invalid", + "resource not found", + ) } |> serve.create_json_response } @@ -89,6 +94,12 @@ fn handle_admin_api( |> serve.create_json_response } +fn fetch_rooms( + room_handler: Started(Subject(RoomControl)), +) -> List(#(String, message.RoomInfo)) { + actor.call(room_handler.data, 1000, message.FetchRooms) +} + fn decode_info( actor: Started(Subject(StateControl)), json_string: decode.Dynamic, @@ -106,31 +117,54 @@ fn decode_info( } } -fn fetch_players( - room_handler: Started(Subject(RoomControl(ClientsServer))), +fn add_player( + player_handler: Started(Subject(message.NotifyServer)), json_string: decode.Dynamic, ) { - let decode_uri = { - use id <- decode.field("id", decode.string) - //use key <- decode.field("key", decode.string) - decode.success(message.FetchRoom(id, _)) + let decode_player = { + use name <- decode.field("name", decode.string) + decode.success(name) } - case decode.run(json_string, decode_uri) { - Ok(room) -> { - case actor.call(room_handler.data, 1000, room) { - option.Some(#(_, player_handler)) -> #( + case decode.run(json_string, decode_player) { + Ok(player) -> { + case actor.call(player_handler.data, 1000, message.AddPlayer(player, _)) { + Ok(id) -> #( 200, - json.to_string(json.object([#("id", json.string("10"))])), - json.to_string(json.object([#("id", json.string("10"))])), + "Added player with name [" <> player <> "] given id [" <> id <> "]", + json.to_string(json.object([#("id", json.string(id))])), ) - option.None -> #( - 404, - "Room not found, or key invalid", - "resource not found", + Error(msg) -> #( + 400, + "Unable to add player [" <> msg <> "]", + "player not added", ) } } - Error(fault) -> #(400, "Unable to fetch players", "bad request") + Error(_msg) -> #( + 400, + "Could not parse player [decoding error]", + "bad request", + ) + } +} + +fn add_room(room_handler: Started(Subject(RoomControl)), json) { + let decode_room = { + use id <- decode.field("id", decode.string) + use pin_enc <- decode.field("pin", decode.string) + use name <- decode.field("name", decode.string) + decode.success(message.CreateRoom( + id:, + room: message.RoomInfo(name, pin_enc), + )) + } + + case decode.run(json, decode_room) { + Ok(player) -> { + actor.send(room_handler.data, player) + #(200, "added room", "added room") + } + Error(_msg) -> #(400, "unable to add room", "bad request") } }