diff --git a/.gitignore b/.gitignore index ef63070..4b6b3fa 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ **/dist /server/priv/static/client.js /server/priv/static/index.html -/quizterm.env diff --git a/Dockerfile b/Dockerfile index 25066e2..4486743 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,6 @@ COPY ./server/src /quizterm/server/src COPY ./server/gleam.toml /quizterm/server/ COPY ./client/src /quizterm/client/src COPY ./client/gleam.toml /quizterm/client/ -COPY ./shared/src /quizterm/shared/src -COPY ./shared/gleam.toml /quizterm/shared/gleam.toml RUN cd /quizterm/server && gleam deps download diff --git a/LICENSE b/LICENSE index 6d251ee..5fc86da 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2026 Steinar Eliassen +Copyright (c) 2025 lettosprey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 76883a6..4b8fe41 100644 --- a/README.md +++ b/README.md @@ -1,61 +1,5 @@ ### Welcome to QUIZTerm -This documentation is for building and running quizterm. You do not need to worry about this -document to be a user. - -#### Getting env variables ready - -An api-key, and a base16-encoded version of it is needed to communicate with the -endpoints. You can use the sha256 command from the "hashalot" bundle or similar. -``` -sha256 -x -Enter passphrase: -``` -The passphrase test will output -``` -9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08 -``` - -This is the value provided in "quizterm.env.example". Feel free to use this for "local -testing", copy the file to "quizterm.env". For non-local testing, pick a better API key... - -The provided "init script" that sets up some "dummy examples" needs the non-hashed -version of the api-key, see the section "Running init script" after "Building and running" - -#### Building and running - -Docker, or a compatible container manager, like podman, is required to build and run -quizterm. The alternative is to install Gleam and Erlang/BEAM and run it dockerless. -Unless you plan to do Gleam development, using Docker will save a lot of hassle. - -To build and start write -``` -docker compose up -``` -You can now access quizterm on http://localhost:1234. If you need a different port, modify -docker-compose.yml, the number 1234 before the colon Note that it will always say -"listening on port 1234", this is the port used inside the docker image. - -Stop quizterm with - -``` -docker compose down -``` - -#### Running the init script - -A provided init script sets up some bits for testing, it creates several "team rooms", -and generates questions and answers. - -If you used the "default" values in quizterm.env, the api-key "test" will work with the -init script. If not, edit the api-test/init.sh file and set correct api-key (non-hashed). - -``` -sh api-test/init.sh -``` - -## The rest of this readme is currently outdated and will be updated shortly - QUIZTerm is a simple online "quiz answering" game. It provides a way for contestants to provide answers to questions, and reveal the answers for everyone at the same time. @@ -77,3 +21,26 @@ Endpoints explained |--------------------------|--------------------------| | ![Screenshot](game1.png) | ![Screenshot](game2.png) | +### Building and running + +Docker, or a compatible container manager, like podman, is required to build and run +quizterm. The alternative is to install Gleam and Erlang/BEAM and run it dockerless. +Unless you plan to do Gleam development, using Docker will save a lot of hassle. + +To compile project and build docker image, write: +``` +docker build . -t quizterm:1 +``` +quizterm can be whatever name you want to give the container, 1 can be +changed to whatever you want the version of the container to be. + +Start server on port 4321: +``` +docker run -p 4321:1234 quizterm:1 +``` + +Port 1234 is the port used internally in the docker container, while 4321 +is the port exposed outside the container. The latter can be set to whatever +port you want to use. + +Open web browser and access http://localhost:4321 diff --git a/api-test/init.sh b/api-test/init.sh index f0daa68..f155b67 100644 --- a/api-test/init.sh +++ b/api-test/init.sh @@ -1,5 +1,5 @@ #!/bin/sh -export API_KEY="X-api-key: test" +export API_KEY="X-api-key: 66db96c6-97c9-419e-ac80-6cf920158844" export URL=http://localhost:1234 echo $URL diff --git a/client/src/view.gleam b/client/src/view.gleam index 8f24fdc..44567c8 100644 --- a/client/src/view.gleam +++ b/client/src/view.gleam @@ -75,6 +75,10 @@ fn view_join_live(room: String, pin: String) -> Element(Msg) { [server_component.route("/socket/live/" <> room <> "/" <> pin)], [], ), + server_component.element( + [server_component.route("/socket/control/" <> room <> "/" <> pin)], + [], + ), ]) } diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 2fde096..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -services: - quizterm: - image: quizterm2 - build: . - ports: - - "1234:1234" - env_file: - - quizterm.env diff --git a/quizterm.env.example b/quizterm.env.example deleted file mode 100644 index 509e4d5..0000000 --- a/quizterm.env.example +++ /dev/null @@ -1,2 +0,0 @@ -SHAED_API_KEY=9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08 -QTERM_SECRET=AVerySecretSentence diff --git a/server/gleam.toml b/server/gleam.toml index a884fd8..3ffb6ca 100644 --- a/server/gleam.toml +++ b/server/gleam.toml @@ -12,5 +12,4 @@ lustre = ">= 5.3.5 and < 6.0.0" gleam_crypto = ">= 1.5.1 and < 2.0.0" group_registry = ">= 1.0.0 and < 2.0.0" wisp = ">= 2.2.1 and < 3.0.0" -envoy = ">= 1.1.0 and < 2.0.0" shared = { path = "../shared" } diff --git a/server/manifest.toml b/server/manifest.toml index 2d98908..cfbf792 100644 --- a/server/manifest.toml +++ b/server/manifest.toml @@ -28,7 +28,6 @@ packages = [ ] [requirements] -envoy = { version = ">= 1.1.0 and < 2.0.0" } gleam_crypto = { version = ">= 1.5.1 and < 2.0.0" } gleam_erlang = { version = ">= 1.0.0 and < 2.0.0" } gleam_http = { version = ">= 3.7.2 and < 5.0.0" } diff --git a/server/src/backend/playerhandler.gleam b/server/src/backend/playerhandler.gleam index b26e5af..10f51cf 100644 --- a/server/src/backend/playerhandler.gleam +++ b/server/src/backend/playerhandler.gleam @@ -17,7 +17,7 @@ type State { State( question_number: Int, // id, (name (question#, answer_attempt) - single_answers: List(#(String, #(String, List(#(String, String))))), + slow_answers: List(#(String, #(String, List(#(String, String))))), // int in #pair: ping counted since response back. name_answers: List(#(String, #(Int, AnswerStatus))), hide_answers: Bool, @@ -71,16 +71,16 @@ pub fn initialize( GiveSingleAnswer(id, question, answer) -> { State( ..state, - single_answers: case list.key_find(state.single_answers, id) { + slow_answers: case list.key_find(state.slow_answers, id) { Ok(value) -> { let #(name, list) = value - list.key_set(state.single_answers, id, #( + list.key_set(state.slow_answers, id, #( name, list.key_set(list, question, answer), )) } Error(_) -> { - state.single_answers + state.slow_answers } }, ) @@ -91,11 +91,11 @@ 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.single_answers, subject) + fetch_players(state.slow_answers, subject) state } message.AddPlayer(name) -> - State(..state, single_answers: add_player(name, state.single_answers)) + State(..state, slow_answers: add_player(name, state.slow_answers)) } |> actor.continue() }) @@ -241,7 +241,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.single_answers, fn(name_answers) { + list.flat_map(state.slow_answers, fn(name_answers) { let #(_, #(name, answers)) = name_answers list.filter_map(answers, fn(number_answer) { let #(answer_number, answer) = number_answer diff --git a/server/src/backend/sockethandler.gleam b/server/src/backend/sockethandler.gleam index c37856d..f4ad8d4 100644 --- a/server/src/backend/sockethandler.gleam +++ b/server/src/backend/sockethandler.gleam @@ -34,7 +34,7 @@ pub fn serve( } } -pub fn serve_single( +pub fn serve_slow( request: Request(Connection), component: lustre.App( #(List(#(String, String)), message.ClientsServer), diff --git a/server/src/quizterm.gleam b/server/src/quizterm.gleam index 0964974..62a25c9 100644 --- a/server/src/quizterm.gleam +++ b/server/src/quizterm.gleam @@ -18,14 +18,10 @@ import web/components/control import web/router import wisp import wisp/wisp_mist -import envoy pub fn main() { wisp.configure_logger() - let assert Ok(sha_api_key) = envoy.get("SHAED_API_KEY") - let assert Ok(secret) = envoy.get("QTERM_SECRET") - let assert Ok(state_handler) = statehandler.initialize() let assert Ok(room_handler) = roomhandler.initialize(state_handler) @@ -52,7 +48,7 @@ pub fn main() { room_handler, ) ["socket", "single", id, pin] -> - sockethandler.serve_single( + sockethandler.serve_slow( req, answerlist.component(), id, @@ -62,8 +58,8 @@ pub fn main() { ) _ -> wisp_mist.handler( - router.handle_request(sha_api_key, room_handler, state_handler, _), - secret, + router.handle_request(room_handler, state_handler, _), + "very_secret", )(req) } } diff --git a/server/src/web/components/card.gleam b/server/src/web/components/card.gleam index 6dddc23..a152783 100644 --- a/server/src/web/components/card.gleam +++ b/server/src/web/components/card.gleam @@ -190,94 +190,83 @@ fn view(model: Model) -> Element(Msg) { ]) } }, - case model.state { - Answer(_) | WaitForQuiz(_) -> - element.fragment([ - html.div([class("terminal-section")], case lobby { - [] -> [] - lobby -> { - let answered = - list.filter(lobby, fn(x) { - case x.answer { - message.IDontKnow - | message.HasAnswered - | message.GivenAnswer(_) -> True - _ -> False - } - }) - |> list.length - |> int.to_string - let size = lobby |> list.length |> int.to_string - [ - html.div([attribute.class("terminal-box")], [ - html.span([attribute.class("terminal-label")], [ - html.text("[PROGRESS] "), - ]), - html.text("Answered: "), - case answered == size { - True -> html.text("Everyone!") - False -> html.text(answered <> "/" <> size) - }, - ]), - ] + html.div([class("terminal-section")], case lobby { + [] -> [] + lobby -> { + let answered = + list.filter(lobby, fn(x) { + case x.answer { + message.IDontKnow | message.HasAnswered | message.GivenAnswer(_) -> + True + _ -> False } - }), - terminal_section( - lobby, - "[ACTIVE TRANSMISSIONS]", - fn(x) { - case x.answer { - message.GivenAnswer(_) | message.HasAnswered -> True - _ -> False - } + }) + |> list.length + |> int.to_string + let size = lobby |> list.length |> int.to_string + [ + html.div([attribute.class("terminal-box")], [ + html.span([attribute.class("terminal-label")], [ + html.text("[PROGRESS] "), + ]), + html.text("Answered: "), + case answered == size { + True -> html.text("Everyone!") + False -> html.text(answered <> "/" <> size) }, - fn(user) { - let User(name, ping_time, answer) = user - case answer { - message.GivenAnswer(answer) -> answer - message.HasAnswered -> "Answer Given" - _ -> "Odd State..." - } - |> content_cell(name, ping_time, _) - }, - ), - terminal_section( - lobby, - "[P A S S]", - fn(x) { - case x.answer { - message.IDontKnow -> True - _ -> False - } - }, - fn(user) { - let User(name, ping_time, _) = user - content_cell(name, ping_time, "P.A.S.S :(") - }, - ), - terminal_section( - lobby, - "[AWAITING RESPONSE]", - fn(x) { - case x.answer { - message.NotAnswered -> True - _ -> False - } - }, - fn(user) { - case user { - User(name, ping_time, _) -> - content_cell(name, ping_time, "Not Answered") - } - }, - ), - server_component.element( - [server_component.route("/socket/control/TMA/PINA")], - [], - ), - ]) - _ -> element.none() - }, + ]), + ] + } + }), + terminal_section( + lobby, + "[ACTIVE TRANSMISSIONS]", + fn(x) { + case x.answer { + message.GivenAnswer(_) | message.HasAnswered -> True + _ -> False + } + }, + fn(user) { + let User(name, ping_time, answer) = user + case answer { + message.GivenAnswer(answer) -> answer + message.HasAnswered -> "Answer Given" + _ -> "Odd State..." + } + |> content_cell(name, ping_time, _) + }, + ), + terminal_section( + lobby, + "[P A S S]", + fn(x) { + case x.answer { + message.IDontKnow -> True + _ -> False + } + }, + fn(user) { + let User(name, ping_time, _) = user + content_cell(name, ping_time, "P.A.S.S :(") + }, + ), + terminal_section( + lobby, + "[AWAITING RESPONSE]", + fn(x) { + case x.answer { + message.NotAnswered -> True + _ -> False + } + }, + fn(user) { + case user { + User(name, ping_time, _) -> + content_cell(name, ping_time, "Not Answered") + } + }, + ), ]) } diff --git a/server/src/web/components/shared.gleam b/server/src/web/components/shared.gleam index 417b6a8..d6a3206 100644 --- a/server/src/web/components/shared.gleam +++ b/server/src/web/components/shared.gleam @@ -110,7 +110,6 @@ pub fn view_players( [click_cell_pair(Some("ENTER NEW PLAYER"), None, True, handler)], ), ), - ]) } diff --git a/server/src/web/router.gleam b/server/src/web/router.gleam index 7112706..fee332c 100644 --- a/server/src/web/router.gleam +++ b/server/src/web/router.gleam @@ -1,19 +1,16 @@ import gleam/bit_array import gleam/crypto -import gleam/dynamic import gleam/dynamic/decode import gleam/erlang/process.{type Subject} import gleam/http import gleam/int import gleam/list import gleam/otp/actor.{type Started} -import gleam/string import shared/message.{type RoomControl, type StateControl} import web/handlers/serve.{html_404} import wisp.{type Request, type Response} pub fn handle_request( - sha_api_key: String, room_handler: Started(Subject(RoomControl)), state_handler: Started(Subject(StateControl)), req: Request, @@ -21,28 +18,24 @@ pub fn handle_request( use req <- middleware(req) case wisp.path_segments(req) { [] | ["index.html"] -> serve.main_html(fetch_rooms(room_handler)) - ["api", ..path] -> - handle_api(sha_api_key, room_handler, state_handler, req, path) - + ["api", "room"] -> handle_room(room_handler, req) + ["api", ..path] -> handle_admin_api(state_handler, req, path) _ -> html_404() } } -fn handle_room( - room_handler: Started(Subject(RoomControl)), - req: Request, - json: dynamic.Dynamic, -) { +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") } + |> serve.create_json_response } -fn handle_api( - sha_api_key: String, - room_handler: Started(Subject(RoomControl)), - state_handler: Started(Subject(StateControl)), +fn handle_admin_api( + actor: Started(Subject(StateControl)), req: Request, path: List(String), ) { @@ -50,23 +43,18 @@ fn handle_api( case list.key_find(req.headers, "x-api-key") { Ok(key) -> { - echo "key" <> key - echo "enc key " - <> string.lowercase( - bit_array.base16_encode(crypto.hash(crypto.Sha256, <>)), - ) - echo "sha" <> sha_api_key case - string.lowercase( - bit_array.base16_encode(crypto.hash(crypto.Sha256, <>)), - ) - == string.lowercase(sha_api_key) + bit_array.base64_encode(crypto.hash(crypto.Sha256, <>), True) + == "1nIr1fQzs0K9UZAeUcG/67n12iRiviIS6gO5WXyI2+0=" { True -> - case path { - ["room"] -> handle_room(room_handler, req, json) - [..path] -> handle_admin_api(state_handler, req, path, json) - _ -> #(404, "bad api path", "Resource not found") + case req.method, path { + http.Post, ["info"] -> decode_info(actor, json) + http.Post, ["questions"] -> + decode_index_to_text(actor, json, message.SetQuestion) + http.Post, ["answers"] -> + decode_index_to_text(actor, json, message.SetAnswer) + _, _ -> #(404, "bad api path", "Resource not found") } False -> { #(401, "invalid api key", "unauthorized") @@ -80,22 +68,6 @@ fn handle_api( |> serve.create_json_response } -fn handle_admin_api( - actor: Started(Subject(StateControl)), - req: Request, - path: List(String), - json: dynamic.Dynamic, -) { - case req.method, path { - http.Post, ["info"] -> decode_info(actor, json) - http.Post, ["questions"] -> - decode_index_to_text(actor, json, message.SetQuestion) - http.Post, ["answers"] -> - decode_index_to_text(actor, json, message.SetAnswer) - _, _ -> #(404, "bad api path", "Resource not found") - } -} - fn fetch_rooms( room_handler: Started(Subject(RoomControl)), ) -> List(#(String, message.RoomInfo)) { diff --git a/shared/gleam.toml b/shared/gleam.toml index 4464dd1..018aa07 100644 --- a/shared/gleam.toml +++ b/shared/gleam.toml @@ -1,6 +1,17 @@ name = "shared" version = "1.0.0" +# Fill out these fields if you intend to generate HTML documentation or publish +# your project to the Hex package manager. +# +# description = "" +# licences = ["Apache-2.0"] +# repository = { type = "github", user = "", repo = "" } +# links = [{ title = "Website", href = "" }] +# +# For a full reference of all the available options, you can have a look at +# https://gleam.run/writing-gleam/gleam-toml/. + [dependencies] gleam_stdlib = ">= 0.44.0 and < 2.0.0" gleam_json = ">= 3.1.0 and < 4.0.0"