From 9f8baf880a7faefad976608bb35838f2f76a37c5 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 15 May 2024 17:36:44 +0200
Subject: [PATCH 01/14] refactor: init rocket project

---
 .gitignore  |    6 +
 Cargo.lock  | 1541 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml  |    9 +
 shell.nix   |    7 +
 src/main.rs |   11 +
 5 files changed, 1574 insertions(+)
 create mode 100644 Cargo.lock
 create mode 100644 Cargo.toml
 create mode 100644 shell.nix
 create mode 100644 src/main.rs

diff --git a/.gitignore b/.gitignore
index 9b8304d..80bc381 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 node_modules
 package-lock.json
 config.js
+.envrc
+.direnv
+
+# Added by cargo
+
+/target
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..6d46f40
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,1541 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "atomic"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
+[[package]]
+name = "atomic"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "binascii"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "bytemuck"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "devise"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6eacefd3f541c66fc61433d65e54e0e46e0a029a819a7dbbc7a7b489e8a85f8"
+dependencies = [
+ "devise_codegen",
+ "devise_core",
+]
+
+[[package]]
+name = "devise_codegen"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6"
+dependencies = [
+ "devise_core",
+ "quote",
+]
+
+[[package]]
+name = "devise_core"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a"
+dependencies = [
+ "bitflags",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "either"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "figment"
+version = "0.10.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d032832d74006f99547004d49410a4b4218e4c33382d56ca3ff89df74f86b953"
+dependencies = [
+ "atomic 0.6.0",
+ "pear",
+ "serde",
+ "toml",
+ "uncased",
+ "version_check",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generator"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "h2"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+ "serde",
+]
+
+[[package]]
+name = "inlinable_string"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.154"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "multer"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http",
+ "httparse",
+ "log",
+ "memchr",
+ "mime",
+ "spin",
+ "tokio",
+ "tokio-util",
+ "version_check",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pear"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467"
+dependencies = [
+ "inlinable_string",
+ "pear_codegen",
+ "yansi",
+]
+
+[[package]]
+name = "pear_codegen"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147"
+dependencies = [
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "ref-cast"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.3",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+
+[[package]]
+name = "rocket"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e7bb57ccb26670d73b6a47396c83139447b9e7878cab627fdfe9ea8da489150"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "atomic 0.5.3",
+ "binascii",
+ "bytes",
+ "either",
+ "figment",
+ "futures",
+ "indexmap",
+ "log",
+ "memchr",
+ "multer",
+ "num_cpus",
+ "parking_lot",
+ "pin-project-lite",
+ "rand",
+ "ref-cast",
+ "rocket_codegen",
+ "rocket_http",
+ "serde",
+ "state",
+ "tempfile",
+ "time",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "ubyte",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "rocket_codegen"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2238066abf75f21be6cd7dc1a09d5414a671f4246e384e49fe3f8a4936bd04c"
+dependencies = [
+ "devise",
+ "glob",
+ "indexmap",
+ "proc-macro2",
+ "quote",
+ "rocket_http",
+ "syn",
+ "unicode-xid",
+ "version_check",
+]
+
+[[package]]
+name = "rocket_http"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37a1663694d059fe5f943ea5481363e48050acedd241d46deb2e27f71110389e"
+dependencies = [
+ "cookie",
+ "either",
+ "futures",
+ "http",
+ "hyper",
+ "indexmap",
+ "log",
+ "memchr",
+ "pear",
+ "percent-encoding",
+ "pin-project-lite",
+ "ref-cast",
+ "serde",
+ "smallvec",
+ "stable-pattern",
+ "state",
+ "time",
+ "tokio",
+ "uncased",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.201"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.201"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "stable-pattern"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "state"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
+dependencies = [
+ "loom",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tokio"
+version = "1.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "traque"
+version = "0.1.0"
+dependencies = [
+ "rocket",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "ubyte"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "uncased"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
+dependencies = [
+ "serde",
+ "version_check",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+dependencies = [
+ "is-terminal",
+]
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..43e1340
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "traque"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rocket = "0.5.0"
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..1051055
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,7 @@
+{ pkgs ? (import <nixpkgs>) { }, lib ? pkgs.lib}:
+let
+  fenix = import (fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz") { };
+in
+pkgs.mkShell {
+  buildInputs = with fenix.latest; [ cargo rustc ];
+}
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..5411c6b
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,11 @@
+#[macro_use] extern crate rocket;
+
+#[get("/")]
+fn index() -> &'static str {
+    "Hello, world!"
+}
+
+#[launch]
+fn rocket() -> _ {
+    rocket::build().mount("/", routes![index])
+}
-- 
2.47.0


From 9ebf7b0f0ad059faa84beb9e12d867b739d6e40d Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Thu, 16 May 2024 16:52:34 +0200
Subject: [PATCH 02/14] Static serving, templating preparation & internal state
 preparation

---
 Cargo.lock                       | 320 ++++++++++++++++++++++++++++++-
 Cargo.toml                       |   4 +
 src/main.rs                      |  54 +++++-
 static/tracking/conscrit.html    |  76 --------
 static/tracking/invalid.html     |  16 --
 static/tracking/vieux.html       | 119 ------------
 {static => templates}/admin.html |   0
 templates/conscrit.html.hbs      |  76 ++++++++
 templates/vieux.html.hbs         | 119 ++++++++++++
 9 files changed, 568 insertions(+), 216 deletions(-)
 delete mode 100644 static/tracking/conscrit.html
 delete mode 100644 static/tracking/invalid.html
 delete mode 100644 static/tracking/vieux.html
 rename {static => templates}/admin.html (100%)
 create mode 100644 templates/conscrit.html.hbs
 create mode 100644 templates/vieux.html.hbs

diff --git a/Cargo.lock b/Cargo.lock
index 6d46f40..e2b89f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -101,12 +101,27 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
 
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
 [[package]]
 name = "bitflags"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "bytemuck"
 version = "1.16.0"
@@ -142,6 +157,40 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -177,13 +226,23 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a"
 dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
 [[package]]
 name = "either"
 version = "1.11.0"
@@ -235,12 +294,33 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "filetime"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "futures"
 version = "0.3.30"
@@ -319,6 +399,16 @@ dependencies = [
  "windows",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -361,6 +451,20 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "handlebars"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
+dependencies = [
+ "log",
+ "pest",
+ "pest_derive",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -448,6 +552,26 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "is-terminal"
 version = "0.4.12"
@@ -465,6 +589,26 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -551,6 +695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
+ "log",
  "wasi",
  "windows-sys 0.48.0",
 ]
@@ -575,6 +720,34 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "normpath"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+dependencies = [
+ "bitflags 2.5.0",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "walkdir",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -640,7 +813,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.1",
  "smallvec",
  "windows-targets 0.52.5",
 ]
@@ -674,6 +847,51 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "pest"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+dependencies = [
+ "memchr",
+ "thiserror",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+dependencies = [
+ "once_cell",
+ "pest",
+ "sha2",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -759,13 +977,22 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
 ]
 
 [[package]]
@@ -886,6 +1113,19 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "rocket_dyn_templates"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04bfc006e547e4f72b760ab861f5943b688aed8a82c4977b5500c98f5d17dbfa"
+dependencies = [
+ "handlebars",
+ "normpath",
+ "notify",
+ "rocket",
+ "walkdir",
+]
+
 [[package]]
 name = "rocket_http"
 version = "0.5.0"
@@ -925,7 +1165,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -944,6 +1184,15 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -996,6 +1245,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -1086,6 +1346,26 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -1286,6 +1566,7 @@ name = "traque"
 version = "0.1.0"
 dependencies = [
  "rocket",
+ "rocket_dyn_templates",
 ]
 
 [[package]]
@@ -1294,6 +1575,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
 [[package]]
 name = "ubyte"
 version = "0.10.4"
@@ -1303,6 +1590,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ucd-trie"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+
 [[package]]
 name = "uncased"
 version = "0.9.10"
@@ -1337,6 +1630,16 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -1368,6 +1671,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
diff --git a/Cargo.toml b/Cargo.toml
index 43e1340..bdab94e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,3 +7,7 @@ edition = "2021"
 
 [dependencies]
 rocket = "0.5.0"
+
+[dependencies.rocket_dyn_templates]
+version = "0.1.0"
+features = ["handlebars"]
diff --git a/src/main.rs b/src/main.rs
index 5411c6b..1067fda 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,50 @@
 #[macro_use] extern crate rocket;
+use rocket::fs::{FileServer, relative};
+use rocket::State;
+use std::{
+    collections::HashMap,
+    sync::RwLock,
+};
+use rocket_dyn_templates::{Template, context};
+
+enum TrackedState {
+    Conscrit {
+        invisible: bool,
+        blurred: bool,
+        captured: bool,
+        malette: bool,
+        invisibility_codes: u32,
+        blur_codes: u32,
+    },
+    Vieux {
+        color: u8,
+        invisible: bool,
+    }
+}
+
+struct Tracked {
+    name: String,
+    pos: (f32, f32),
+    state: TrackedState,
+}
+
+type Tracking = RwLock<HashMap<String, RwLock<Tracked>>>;
+
+#[get("/track/conscrit")]
+fn conscrit() -> Template{
+    Template::render("conscrit", context!{
+        name: "un nom",
+        id: "ID",
+        gpslog: "no"
+    })
+}
+
+#[put("/track/<id>?<lat>&<long>")]
+fn store_pos(id: String, lat: f32, long: f32, tracking: &State<Tracking>){
+    if let Some(tracked) = tracking.read().unwrap().get(&id) {
+        tracked.write().unwrap().pos = (lat, long);
+    }
+}
 
 #[get("/")]
 fn index() -> &'static str {
@@ -7,5 +53,11 @@ fn index() -> &'static str {
 
 #[launch]
 fn rocket() -> _ {
-    rocket::build().mount("/", routes![index])
+    let tracking = HashMap::<String, RwLock<Tracked>>::from([
+    ]);
+    rocket::build()
+        .attach(Template::fairing())
+        .manage(RwLock::new(tracking))
+        .mount("/", routes![index, store_pos, conscrit])
+        .mount("/", FileServer::from(relative!("static")))
 }
diff --git a/static/tracking/conscrit.html b/static/tracking/conscrit.html
deleted file mode 100644
index 2bdb4ef..0000000
--- a/static/tracking/conscrit.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Traque | Client conscrit</title>
-
-	<!-- LEAFLET INCLUDE -->
-	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
-	integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
-	crossorigin=""/>
-	<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
-	integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
-	crossorigin=""></script>
-
-	<!-- SOCKET.IO INCLUDE -->
-	<script src="/socket.io/socket.io.js"></script>
-
-	<style type="text/css">
-		#map { height: 600px; }
-		#codes {
-			position: fixed;
-			bottom: 0px;
-			z-index:  10000;
-			background-color: white;
-			width: 100%;
-		}
-	</style>
-
-	<script type="text/javascript" src="/utils.js"></script>
-</head>
-<body>
-	<div id="map"></div><br/>
-
-	<div id="codes"></div>
-	<div id="thanks">
-        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=50px /></a><br/>
-        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
-    </div>
-
-	<script type="text/javascript">
-		//////////////////////////////////////////////////////////////////////////////
-		// SETUP MAP
-
-		setup_map();
-
-		//////////////////////////////////////////////////////////////////////////////
-		// SOCKET
-
-        id = "%ID"; // %ID will be replaced by the real id.
-        socket = io({rejectUnauthorized: false, auth: {id: id, type:"conscrit"}});
-		setup_socket_common();
-
-		//////////////////////////////////////////////////////////////////////////////
-		// SETTINGS -- CODE
-
-        socket.on('setCodes', function(codes){
-            var code_buttons = "";
-            if(codes.invisibility > 0)
-                code_buttons += `<button onclick="socket.emit('useCode', 'invisibility')">
-                                    Invisibilité
-                                </button>`;
-            if(codes.blurred > 0)
-                code_buttons += `<button onclick="socket.emit('useCode', 'blurred')">
-                                    Brouillage
-                                </button>`;
-            document.getElementById(`codes`).innerHTML = code_buttons;
-        });
-
-		//////////////////////////////////////////////////////////////////////////////
-		// GEOLOCALISATION
-
-		if(%GPSLOG) setup_geoLoc();
-	</script>
-</body>
-</html>
diff --git a/static/tracking/invalid.html b/static/tracking/invalid.html
deleted file mode 100644
index a2d24a6..0000000
--- a/static/tracking/invalid.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title> Équipe %ID inconnue ! </title>
-</head>
-<body>
-    <h1> Équipe %ID inconnue ! </h1>
-    Utilise bien les urls qu'on te donne petit conscrit.
-
-    <br/><br/>
-    <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=50px /></a><br/>
-    <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
-</body>
-</html>
diff --git a/static/tracking/vieux.html b/static/tracking/vieux.html
deleted file mode 100644
index 2598c43..0000000
--- a/static/tracking/vieux.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Traque | Client vieilleux</title>
-
-	<!-- LEAFLET INCLUDE -->
-	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
-	integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
-	crossorigin=""/>
-	<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
-	integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
-	crossorigin=""></script>
-
-	<!-- SOCKET.IO INCLUDE -->
-	<script src="/socket.io/socket.io.js"></script>
-
-	<style type="text/css">
-		#map { height: 600px; }
-		#below {
-			position: fixed;
-			bottom: 0px;
-			z-index:  10000;
-			background-color: white;
-			width: 100%;
-		}
-	</style>
-
-	<script type="text/javascript" src="/utils.js"></script>
-</head>
-<body>
-	<div id="map"></div><br/>
-
-	<div id="below">
-        <form id="state">
-            <input type="checkbox" id="invisibility" name="invisibility" checked onclick='sendState()' />
-            <label for="invisibility">Invisible</label>
-
-            <input type="checkbox" id="blurred" name="blurred" onclick='sendState()' />
-            <label for="blurred">Brouillé</label></br>
-
-            <input type="radio" id="npc0" name="npc" value=0 onclick='sendState()' />
-            <label for="npc0">Traqueur</label>
-            <input type="radio" id="npc1" name="npc" value=1 checked onclick='sendState()' />
-            <label for="npc1"><img src="/icons/3.png" height=15px></label>
-            <input type="radio" id="npc2" name="npc" value=2 checked onclick='sendState()' />
-            <label for="npc2"><img src="/icons/4.png" height=15px></label>
-            <input type="radio" id="npc3" name="npc" value=3 checked onclick='sendState()' />
-            <label for="npc3"><img src="/icons/5.png" height=15px></label>
-            <input type="radio" id="npc4" name="npc" value=4 checked onclick='sendState()' />
-            <label for="npc4"><img src="/icons/6.png" height=15px></label>
-            <input type="radio" id="npc5" name="npc" value=5 checked onclick='sendState()' />
-            <label for="npc5"><img src="/icons/7.png" height=15px></label>
-            <input type="radio" id="npc6" name="npc" value=6 checked onclick='sendState()' />
-            <label for="npc6"><img src="/icons/8.png" height=15px></label>
-            <input type="radio" id="npc7" name="npc" value=7 checked onclick='sendState()' />
-            <label for="npc7"><img src="/icons/9.png" height=15px></label>
-            <input type="radio" id="npc8" name="npc" value=8 checked onclick='sendState()' />
-            <label for="npc8"><img src="/icons/10.png" height=15px></label>
-            <input type="radio" id="npc9" name="npc" value=9 checked onclick='sendState()' />
-            <label for="npc9"><img src="/icons/11.png" height=15px></label>
-        </form><br/>
-        
-        <br/>
-        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=50px /></a><br/>
-        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
-	</div>
-
-	<script type="text/javascript">
-		//////////////////////////////////////////////////////////////////////////////
-		// SETUP MAP
-
-		setup_map();
-		
-		//////////////////////////////////////////////////////////////////////////////
-		// UPDATE MAP
-
-        id = "%ID"; // %ID will be replaced by the real id.
-        socket = io({rejectUnauthorized: false, auth: {id: id, type:"vieux"}});
-		setup_socket_common();
-
-		//////////////////////////////////////////////////////////////////////////////
-		// SETTINGS -- State
-
-        var form = document.querySelector("#state");
-        function sendState(){
-            const data = new FormData(form);
-            var nState = {};
-            for(entry of data)
-                nState[entry[0]] = entry[1];
-            nState.invisibility = "invisibility" in nState;
-            nState.blurred = "blurred" in nState;
-            nState.tracker = nState.npc == 0;
-            socket.emit('changeState', nState);
-        }
-
-        socket.on('newState', function(state){
-            document.querySelector("#invisibility").checked = state.invisibility;
-            document.querySelector("#blurred").checked = state.blurred;
-            document.querySelector("#npc0").checked = state.npc == 0;
-            document.querySelector("#npc1").checked = state.npc == 1;
-            document.querySelector("#npc2").checked = state.npc == 2;
-            document.querySelector("#npc3").checked = state.npc == 3;
-            document.querySelector("#npc4").checked = state.npc == 4;
-            document.querySelector("#npc5").checked = state.npc == 5;
-            document.querySelector("#npc6").checked = state.npc == 6;
-            document.querySelector("#npc7").checked = state.npc == 7;
-            document.querySelector("#npc8").checked = state.npc == 8;
-            document.querySelector("#npc9").checked = state.npc == 9;
-        });
-
-		//////////////////////////////////////////////////////////////////////////////
-		// GEOLOCALISATION
-
-		if(%GPSLOG) setup_geoLoc();
-	</script>
-</body>
-</html>
diff --git a/static/admin.html b/templates/admin.html
similarity index 100%
rename from static/admin.html
rename to templates/admin.html
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
new file mode 100644
index 0000000..167add7
--- /dev/null
+++ b/templates/conscrit.html.hbs
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Traque -- {{name}} | Client conscrit</title>
+
+  <!-- LEAFLET INCLUDE -->
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
+  integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
+  crossorigin=""/>
+  <script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
+  integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
+  crossorigin=""></script>
+
+  <!-- SOCKET.IO INCLUDE -->
+  <script src="/socket.io/socket.io.js"></script>
+
+  <style type="text/css">
+    #map { height: 600px; }
+    #codes {
+      position: fixed;
+      bottom: 0px;
+      z-index:  10000;
+      background-color: white;
+      width: 100%;
+    }
+  </style>
+
+  <script type="text/javascript" src="/utils.js"></script>
+</head>
+<body>
+  <div id="map"></div><br/>
+
+  <div id="codes"></div>
+  <div id="thanks">
+        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=50px /></a><br/>
+        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
+    </div>
+
+  <script type="text/javascript">
+//  //////////////////////////////////////////////////////////////////////////////
+//  // SETUP MAP
+
+//  setup_map();
+
+//  //////////////////////////////////////////////////////////////////////////////
+//  // SOCKET
+
+//  id = "{{id}}";
+//  socket = io({rejectUnauthorized: false, auth: {id: id, type:"conscrit"}});
+//  setup_socket_common();
+
+//  //////////////////////////////////////////////////////////////////////////////
+//  // SETTINGS -- CODE
+
+//  socket.on('setCodes', function(codes){
+//      var code_buttons = "";
+//      if(codes.invisibility > 0)
+//          code_buttons += `<button onclick="socket.emit('useCode', 'invisibility')">
+//                              Invisibilité
+//                          </button>`;
+//      if(codes.blurred > 0)
+//          code_buttons += `<button onclick="socket.emit('useCode', 'blurred')">
+//                              Brouillage
+//                          </button>`;
+//      document.getElementById(`codes`).innerHTML = code_buttons;
+//  });
+
+//  //////////////////////////////////////////////////////////////////////////////
+//  // GEOLOCALISATION
+
+//  if({{gpslog}}) setup_geoLoc();
+  </script>
+</body>
+</html>
diff --git a/templates/vieux.html.hbs b/templates/vieux.html.hbs
new file mode 100644
index 0000000..87f2bf1
--- /dev/null
+++ b/templates/vieux.html.hbs
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Traque -- {{name}} | Client vieilleux</title>
+
+  <!-- LEAFLET INCLUDE -->
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
+  integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
+  crossorigin=""/>
+  <script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
+  integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
+  crossorigin=""></script>
+
+  <!-- SOCKET.IO INCLUDE -->
+  <script src="/socket.io/socket.io.js"></script>
+
+  <style type="text/css">
+    #map { height: 600px; }
+    #below {
+      position: fixed;
+      bottom: 0px;
+      z-index:  10000;
+      background-color: white;
+      width: 100%;
+    }
+  </style>
+
+  <script type="text/javascript" src="/utils.js"></script>
+</head>
+<body>
+  <div id="map"></div><br/>
+
+  <div id="below">
+        <form id="state">
+            <input type="checkbox" id="invisibility" name="invisibility" checked onclick='sendState()' />
+            <label for="invisibility">Invisible</label>
+
+            <input type="checkbox" id="blurred" name="blurred" onclick='sendState()' />
+            <label for="blurred">Brouillé</label></br>
+
+            <input type="radio" id="npc0" name="npc" value=0 onclick='sendState()' />
+            <label for="npc0">Traqueur</label>
+            <input type="radio" id="npc1" name="npc" value=1 checked onclick='sendState()' />
+            <label for="npc1"><img src="/icons/3.png" height=15px></label>
+            <input type="radio" id="npc2" name="npc" value=2 checked onclick='sendState()' />
+            <label for="npc2"><img src="/icons/4.png" height=15px></label>
+            <input type="radio" id="npc3" name="npc" value=3 checked onclick='sendState()' />
+            <label for="npc3"><img src="/icons/5.png" height=15px></label>
+            <input type="radio" id="npc4" name="npc" value=4 checked onclick='sendState()' />
+            <label for="npc4"><img src="/icons/6.png" height=15px></label>
+            <input type="radio" id="npc5" name="npc" value=5 checked onclick='sendState()' />
+            <label for="npc5"><img src="/icons/7.png" height=15px></label>
+            <input type="radio" id="npc6" name="npc" value=6 checked onclick='sendState()' />
+            <label for="npc6"><img src="/icons/8.png" height=15px></label>
+            <input type="radio" id="npc7" name="npc" value=7 checked onclick='sendState()' />
+            <label for="npc7"><img src="/icons/9.png" height=15px></label>
+            <input type="radio" id="npc8" name="npc" value=8 checked onclick='sendState()' />
+            <label for="npc8"><img src="/icons/10.png" height=15px></label>
+            <input type="radio" id="npc9" name="npc" value=9 checked onclick='sendState()' />
+            <label for="npc9"><img src="/icons/11.png" height=15px></label>
+        </form><br/>
+        
+        <br/>
+        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=50px /></a><br/>
+        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
+  </div>
+
+  <script type="text/javascript">
+//  //////////////////////////////////////////////////////////////////////////////
+//  // SETUP MAP
+
+//  setup_map();
+//  
+//  //////////////////////////////////////////////////////////////////////////////
+//  // UPDATE MAP
+
+//  id = "{{id}}";
+//  socket = io({rejectUnauthorized: false, auth: {id: id, type:"vieux"}});
+//  setup_socket_common();
+
+//  //////////////////////////////////////////////////////////////////////////////
+//  // SETTINGS -- State
+
+//  var form = document.querySelector("#state");
+//  function sendState(){
+//      const data = new FormData(form);
+//      var nState = {};
+//      for(entry of data)
+//          nState[entry[0]] = entry[1];
+//      nState.invisibility = "invisibility" in nState;
+//      nState.blurred = "blurred" in nState;
+//      nState.tracker = nState.npc == 0;
+//      socket.emit('changeState', nState);
+//  }
+
+//  socket.on('newState', function(state){
+//      document.querySelector("#invisibility").checked = state.invisibility;
+//      document.querySelector("#blurred").checked = state.blurred;
+//      document.querySelector("#npc0").checked = state.npc == 0;
+//      document.querySelector("#npc1").checked = state.npc == 1;
+//      document.querySelector("#npc2").checked = state.npc == 2;
+//      document.querySelector("#npc3").checked = state.npc == 3;
+//      document.querySelector("#npc4").checked = state.npc == 4;
+//      document.querySelector("#npc5").checked = state.npc == 5;
+//      document.querySelector("#npc6").checked = state.npc == 6;
+//      document.querySelector("#npc7").checked = state.npc == 7;
+//      document.querySelector("#npc8").checked = state.npc == 8;
+//      document.querySelector("#npc9").checked = state.npc == 9;
+//  });
+
+//  //////////////////////////////////////////////////////////////////////////////
+//  // GEOLOCALISATION
+
+//  if({{gpslog}}) setup_geoLoc();
+  </script>
+</body>
+</html>
-- 
2.47.0


From a0ec314cacca7e713cc4441868ea6004bb1dd974 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Thu, 16 May 2024 22:24:47 +0200
Subject: [PATCH 03/14] event stream

---
 Cargo.lock                  |   1 +
 Cargo.toml                  |   5 +-
 shell.nix                   |   2 +-
 src/main.rs                 | 128 +++++++++++++++++++++++++++++++-----
 templates/conscrit.html.hbs |   9 +--
 5 files changed, 120 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2b89f7..e2538a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1085,6 +1085,7 @@ dependencies = [
  "rocket_codegen",
  "rocket_http",
  "serde",
+ "serde_json",
  "state",
  "tempfile",
  "time",
diff --git a/Cargo.toml b/Cargo.toml
index bdab94e..cbc8538 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,8 +5,9 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
-rocket = "0.5.0"
+[dependencies.rocket]
+version = "0.5.0"
+features = ["json"]
 
 [dependencies.rocket_dyn_templates]
 version = "0.1.0"
diff --git a/shell.nix b/shell.nix
index 1051055..51e7db0 100644
--- a/shell.nix
+++ b/shell.nix
@@ -3,5 +3,5 @@ let
   fenix = import (fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz") { };
 in
 pkgs.mkShell {
-  buildInputs = with fenix.latest; [ cargo rustc ];
+  buildInputs = with fenix.latest; [ cargo rustc rustfmt ];
 }
diff --git a/src/main.rs b/src/main.rs
index 1067fda..5e80c2a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,17 @@
-#[macro_use] extern crate rocket;
-use rocket::fs::{FileServer, relative};
-use rocket::State;
-use std::{
-    collections::HashMap,
-    sync::RwLock,
+#[macro_use]
+extern crate rocket;
+use rocket::{
+    fs::{relative, FileServer},
+    response::stream::{Event, EventStream},
+    serde::Serialize,
+    tokio::{
+        select,
+        time::{self, Duration},
+    },
+    Shutdown, State,
 };
-use rocket_dyn_templates::{Template, context};
+use rocket_dyn_templates::{context, Template};
+use std::{collections::HashMap, sync::RwLock};
 
 enum TrackedState {
     Conscrit {
@@ -19,7 +25,7 @@ enum TrackedState {
     Vieux {
         color: u8,
         invisible: bool,
-    }
+    },
 }
 
 struct Tracked {
@@ -28,20 +34,90 @@ struct Tracked {
     state: TrackedState,
 }
 
+fn build_conscrit(name: String) -> Tracked {
+    Tracked {
+        name: name,
+        pos: (0.0, 0.0),
+        state: TrackedState::Conscrit {
+            invisible: false,
+            blurred: false,
+            captured: false,
+            malette: false,
+            invisibility_codes: 0,
+            blur_codes: 0,
+        },
+    }
+}
+
+fn build_vieux(name: String) -> Tracked {
+    Tracked {
+        name: name,
+        pos: (0.0, 0.0),
+        state: TrackedState::Vieux {
+            invisible: true,
+            color: 1,
+        },
+    }
+}
+
 type Tracking = RwLock<HashMap<String, RwLock<Tracked>>>;
 
-#[get("/track/conscrit")]
-fn conscrit() -> Template{
-    Template::render("conscrit", context!{
-        name: "un nom",
-        id: "ID",
-        gpslog: "no"
-    })
+#[derive(Serialize)]
+#[serde(crate = "rocket::serde")]
+struct TrackedInfo {
+    name: String,
+    pos: (f32, f32),
+}
+
+#[get("/track/<id>?<gpslog>")]
+fn tracked_view(id: &str, gpslog: Option<bool>, tracking: &State<Tracking>) -> Option<Template> {
+    if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
+        Some(Template::render(
+            match tracked.read().unwrap().state {
+                TrackedState::Vieux { .. } => "vieux",
+                TrackedState::Conscrit { .. } => "conscrit",
+            },
+            context! {
+                name: &tracked.read().unwrap().name,
+                id: &id,
+                gpslog: gpslog.unwrap_or(true)
+            },
+        ))
+    } else {
+        None
+    }
+}
+
+#[get("/track/<id>/events")]
+fn tracked_events<'a>(
+    id: &'a str,
+    tracking: &'a State<Tracking>,
+    mut shutdown: Shutdown,
+) -> Option<EventStream![Event + 'a]> {
+    if tracking.read().unwrap().contains_key(&id.to_string()) {
+        Some(EventStream! {
+            let mut interval = time::interval(Duration::from_secs(5));
+            loop {
+                select!{
+                    _ = interval.tick() => {
+                        let info = TrackedInfo {
+                            name: id.to_string(),
+                            pos: tracking.read().unwrap().get(&id.to_string()).unwrap().read().unwrap().pos
+                        };
+                        yield Event::json(&info).event("coords")
+                    },
+                    _ = &mut shutdown => break
+                }
+            }
+        })
+    } else {
+        None
+    }
 }
 
 #[put("/track/<id>?<lat>&<long>")]
-fn store_pos(id: String, lat: f32, long: f32, tracking: &State<Tracking>){
-    if let Some(tracked) = tracking.read().unwrap().get(&id) {
+fn store_pos(id: &str, lat: f32, long: f32, tracking: &State<Tracking>) {
+    if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
         tracked.write().unwrap().pos = (lat, long);
     }
 }
@@ -54,10 +130,26 @@ fn index() -> &'static str {
 #[launch]
 fn rocket() -> _ {
     let tracking = HashMap::<String, RwLock<Tracked>>::from([
+        (
+            "team00".to_string(),
+            RwLock::new(build_conscrit("Équipe 0".to_string())),
+        ),
+        (
+            "team01".to_string(),
+            RwLock::new(build_conscrit("Équipe 1".to_string())),
+        ),
+        (
+            "npc0".to_string(),
+            RwLock::new(build_vieux("PNJ 0".to_string())),
+        ),
+        (
+            "npc1".to_string(),
+            RwLock::new(build_vieux("PNJ 1".to_string())),
+        ),
     ]);
     rocket::build()
         .attach(Template::fairing())
         .manage(RwLock::new(tracking))
-        .mount("/", routes![index, store_pos, conscrit])
+        .mount("/", routes![index, store_pos, tracked_view, tracked_events])
         .mount("/", FileServer::from(relative!("static")))
 }
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
index 167add7..c9371a9 100644
--- a/templates/conscrit.html.hbs
+++ b/templates/conscrit.html.hbs
@@ -13,9 +13,6 @@
   integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
   crossorigin=""></script>
 
-  <!-- SOCKET.IO INCLUDE -->
-  <script src="/socket.io/socket.io.js"></script>
-
   <style type="text/css">
     #map { height: 600px; }
     #codes {
@@ -27,7 +24,7 @@
     }
   </style>
 
-  <script type="text/javascript" src="/utils.js"></script>
+  <!-- <script type="text/javascript" src="/utils.js"></script> -->
 </head>
 <body>
   <div id="map"></div><br/>
@@ -39,6 +36,10 @@
     </div>
 
   <script type="text/javascript">
+  const evtSource = new EventSource("/track/{{id}}/events");
+  evtSource.addEventListener("coords", (event) => {
+    console.log(event);
+  });
 //  //////////////////////////////////////////////////////////////////////////////
 //  // SETUP MAP
 
-- 
2.47.0


From e3aea1494d9585c8a45048b2edd8d2635f34c9a3 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 22 May 2024 15:54:49 +0200
Subject: [PATCH 04/14] vision implementation

---
 Cargo.lock                  |   1 +
 Cargo.toml                  |   3 +
 src/main.rs                 | 165 ++++++++++++++++++++++++++++++++----
 static/utils.js             | 114 +++++++++++++------------
 templates/conscrit.html.hbs |  21 ++---
 5 files changed, 222 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2538a5..c8c50b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1566,6 +1566,7 @@ dependencies = [
 name = "traque"
 version = "0.1.0"
 dependencies = [
+ "rand",
  "rocket",
  "rocket_dyn_templates",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index cbc8538..136c681 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,9 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[dependencies]
+rand = "0.8.5"
+
 [dependencies.rocket]
 version = "0.5.0"
 features = ["json"]
diff --git a/src/main.rs b/src/main.rs
index 5e80c2a..79175b1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,6 @@
 #[macro_use]
 extern crate rocket;
+use rand::Rng;
 use rocket::{
     fs::{relative, FileServer},
     response::stream::{Event, EventStream},
@@ -18,7 +19,7 @@ enum TrackedState {
         invisible: bool,
         blurred: bool,
         captured: bool,
-        malette: bool,
+        mallette: bool,
         invisibility_codes: u32,
         blur_codes: u32,
     },
@@ -28,29 +29,98 @@ enum TrackedState {
     },
 }
 
+use TrackedState::{Conscrit, Vieux};
+
+const BLURRED_MOVE: (f32, f32) = (0.0005, 0.0005);
+
+impl TrackedState {
+    fn invisible(&self) -> bool {
+        match self {
+            Conscrit { invisible, .. } => *invisible,
+            Vieux { invisible, .. } => *invisible,
+        }
+    }
+    fn blurred(&self) -> bool {
+        match self {
+            Conscrit { blurred, .. } => *blurred,
+            Vieux { .. } => false,
+        }
+    }
+    fn global_viewed(&self) -> bool {
+        match self {
+            Conscrit {
+                captured,
+                mallette,
+                invisible,
+                ..
+            } => (*captured || *mallette) && !*invisible,
+            Vieux { invisible, .. } => !*invisible,
+        }
+    }
+    fn color(&self) -> u8 {
+        match self {
+            Vieux { color, .. } => *color,
+            Conscrit { captured, .. } => {
+                if *captured {
+                    1
+                } else {
+                    0
+                }
+            }
+        }
+    }
+    fn admin_color(&self) -> u8 {
+        match self {
+            Vieux { color, invisible } => {
+                if *invisible {
+                    2
+                } else {
+                    *color
+                }
+            }
+            Conscrit {
+                invisible,
+                captured,
+                ..
+            } => {
+                if *invisible {
+                    2
+                } else if *captured {
+                    1
+                } else {
+                    0
+                }
+            }
+        }
+    }
+}
+
 struct Tracked {
+    id: String,
     name: String,
     pos: (f32, f32),
     state: TrackedState,
 }
 
-fn build_conscrit(name: String) -> Tracked {
+fn build_conscrit(id: String, name: String) -> Tracked {
     Tracked {
+        id: id,
         name: name,
         pos: (0.0, 0.0),
         state: TrackedState::Conscrit {
             invisible: false,
             blurred: false,
             captured: false,
-            malette: false,
+            mallette: false,
             invisibility_codes: 0,
             blur_codes: 0,
         },
     }
 }
 
-fn build_vieux(name: String) -> Tracked {
+fn build_vieux(id: String, name: String) -> Tracked {
     Tracked {
+        id: id,
         name: name,
         pos: (0.0, 0.0),
         state: TrackedState::Vieux {
@@ -67,6 +137,64 @@ type Tracking = RwLock<HashMap<String, RwLock<Tracked>>>;
 struct TrackedInfo {
     name: String,
     pos: (f32, f32),
+    me: bool,
+    color: u8,
+}
+
+fn base_view(team: &Tracked) -> TrackedInfo {
+    TrackedInfo {
+        name: team.name.clone(),
+        pos: team.pos,
+        me: false,
+        color: team.state.color(),
+    }
+}
+
+fn admin_view(team: &Tracked) -> TrackedInfo {
+    TrackedInfo {
+        name: team.name.clone(),
+        pos: team.pos,
+        me: false,
+        color: team.state.admin_color(),
+    }
+}
+
+fn apparent_info(watcher: &Tracked, team: &Tracked) -> Option<TrackedInfo> {
+    if watcher.id == team.id {
+        Some(TrackedInfo {
+            me: true,
+            ..admin_view(team)
+        })
+    } else if let Conscrit {
+        captured, mallette, ..
+    } = watcher.state
+    {
+        if captured {
+            if team.state.invisible() {
+                None
+            } else if team.state.blurred() {
+                let mut rng = rand::thread_rng();
+                let (lat, lon) = team.pos;
+                Some(TrackedInfo {
+                    pos: (
+                        lat + BLURRED_MOVE.0 * (rng.gen::<f32>() * 2.0 - 1.0),
+                        lon + BLURRED_MOVE.1 * (rng.gen::<f32>() * 2.0 - 1.0),
+                    ),
+                    ..base_view(team)
+                })
+            } else {
+                Some(base_view(team))
+            }
+        } else {
+            if mallette || team.state.global_viewed() {
+                Some(base_view(team))
+            } else {
+                None
+            }
+        }
+    } else {
+        Some(admin_view(team))
+    }
 }
 
 #[get("/track/<id>?<gpslog>")]
@@ -88,6 +216,18 @@ fn tracked_view(id: &str, gpslog: Option<bool>, tracking: &State<Tracking>) -> O
     }
 }
 
+fn info_to_send(id: &String, tracking: &Tracking) -> Vec<TrackedInfo> {
+    let tracking_lock = tracking.read().unwrap();
+    let watcher = tracking_lock.get(id).unwrap().read().unwrap();
+    let mut infos: Vec<TrackedInfo> = Vec::new();
+    for (_, tracked) in tracking_lock.iter() {
+        if let Some(info) = apparent_info(&watcher, &tracked.read().unwrap()) {
+            infos.push(info);
+        }
+    }
+    infos
+}
+
 #[get("/track/<id>/events")]
 fn tracked_events<'a>(
     id: &'a str,
@@ -99,13 +239,8 @@ fn tracked_events<'a>(
             let mut interval = time::interval(Duration::from_secs(5));
             loop {
                 select!{
-                    _ = interval.tick() => {
-                        let info = TrackedInfo {
-                            name: id.to_string(),
-                            pos: tracking.read().unwrap().get(&id.to_string()).unwrap().read().unwrap().pos
-                        };
-                        yield Event::json(&info).event("coords")
-                    },
+                    _ = interval.tick() =>
+                        yield Event::json(&info_to_send(&id.to_string(), &tracking)).event("coords"),
                     _ = &mut shutdown => break
                 }
             }
@@ -132,19 +267,19 @@ fn rocket() -> _ {
     let tracking = HashMap::<String, RwLock<Tracked>>::from([
         (
             "team00".to_string(),
-            RwLock::new(build_conscrit("Équipe 0".to_string())),
+            RwLock::new(build_conscrit("team00".to_string(), "Équipe 0".to_string())),
         ),
         (
             "team01".to_string(),
-            RwLock::new(build_conscrit("Équipe 1".to_string())),
+            RwLock::new(build_conscrit("team01".to_string(), "Équipe 1".to_string())),
         ),
         (
             "npc0".to_string(),
-            RwLock::new(build_vieux("PNJ 0".to_string())),
+            RwLock::new(build_vieux("npc0".to_string(), "PNJ 0".to_string())),
         ),
         (
             "npc1".to_string(),
-            RwLock::new(build_vieux("PNJ 1".to_string())),
+            RwLock::new(build_vieux("npc1".to_string(), "PNJ 1".to_string())),
         ),
     ]);
     rocket::build()
diff --git a/static/utils.js b/static/utils.js
index c5ccd3b..54d93b7 100644
--- a/static/utils.js
+++ b/static/utils.js
@@ -1,9 +1,5 @@
-var protocol = location.protocol;
-var server = location.hostname;
-var port = location.port;
-var socket;
-var id;
-var markers = {};
+var evtsource;
+var markers = [];
 
 var CircleIcon = L.Icon.extend({
     options: {
@@ -67,70 +63,80 @@ var map_border = [
 var map;
 
 function setup_map(){
-	map = L.map('map').setView([48.8448, 2.3550], 13);
+  map = L.map('map').setView([48.8448, 2.3550], 13);
 
-	L.tileLayer('https://stamen-tiles.a.ssl.fastly.net/toner/{z}/{x}/{y}.png', {
-	    maxZoom: 19,
-	    attribution: '© OpenStreetMap'
-	}).addTo(map);
+  L.tileLayer('https://tiles.stadiamaps.com/tiles/stamen_toner/{z}/{x}/{y}{r}.{ext}', {
+      maxZoom: 20,
+      minZoom: 0,
+      attribution: '&copy; <a href="https://www.stadiamaps.com/" target="_blank">Stadia Maps</a> &copy; <a href="https://www.stamen.com/" target="_blank">Stamen Design</a> &copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+      ext: 'png'
+  }).addTo(map);
 
-    L.polyline(map_border, {color: 'red'}).addTo(map);
+  L.polyline(map_border, {color: 'red'}).addTo(map);
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// SOCKET
+// EVENT LISTENNING
 
-function setup_socket_common(){
-    socket.on("moving", function(data){
-        console.log("moving", data);
-        if(!(data.id in markers)){
-            if(data.id == id){
-                markers[data.id] = L.marker(data.position, {"icon": self_icons[data.color]}).addTo(map);
-                markers[data.id].setZIndexOffset(10000);
-            }
-            else
-                markers[data.id] = L.marker(data.position, {"icon": icons[data.color]}).addTo(map);
-            markers[data.id].bindPopup(data.id);
-        } else{
-            markers[data.id].setLatLng(data.position);
-            if(data.id == id)
-                markers[data.id].setIcon(self_icons[data.color]);
-            else
-                markers[data.id].setIcon(icons[data.color]);
-        }
-    });
+function setup_evtlisten_common(){
+  evtSource.addEventListener("coords", (event) => {
+    const data = JSON.parse(event.data);
+    console.log(data);
+    var i = 0;
+    for (tracked of data) {
+      if (i == markers.length) {
+        markers.push(L.marker([0,0], {"icon": icons[0] }).addTo(map));
+        markers[i].bindPopup("");
+      }
+      markers[i].setLatLng(tracked.pos);
+      markers[i].setPopupContent(tracked.name);
+      if (tracked.me) {
+        markers[i].setIcon(self_icons[tracked.color]);
+        markers[i].setZIndexOffset(1000);
+      } else {
+        markers[i].setIcon(icons[tracked.color]);
+        markers[i].setZIndexOffset(0);
+      }
+      ++i;
+    }
+    for (; i < markers.length; ++i) {
+      markers[i].setLatLng([0,0]);
+    }
+  });
 
-	socket.on("popup", function(data){
-		alert(data.content);
-	});
+  //socket.on("popup", function(data){
+  //  alert(data.content);
+  //});
 
-	socket.on("remove", function(data){
-		if(data.id in markers)
-			markers[data.id].remove();
-	});
+  //socket.on("remove", function(data){
+  //  if(data.id in markers)
+  //    markers[data.id].remove();
+  //});
 
-	socket.on("newTracker", function(data){
-		L.marker(data.position, {"icon": icons[1]}).addTo(map);
-	});
+  //socket.on("newTracker", function(data){
+  //  L.marker(data.position, {"icon": icons[1]}).addTo(map);
+  //});
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // GEOLOCALISATION
 
 function setup_geoLoc(){
-	function geoLoc_success(pos) {
-        fetch("/log?id="+id+"&lat="+pos.coords.latitude+"&lon="+pos.coords.longitude);
-	}
+  const requestOptions = { method: 'PUT' };
 
-	function geoLoc_error(err) {
-		console.error(`ERROR(${err.code}): ${err.message}`);
-	}
+  function geoLoc_success(pos) {
+    fetch("/log/"+id+"?lat="+pos.coords.latitude+"&long="+pos.coords.longitude, requestOptions);
+  }
 
-	var options = {
-		enableHighAccuracy: false,
-		timeout: 5000,
-		maximumAge: 0
-	};
+  function geoLoc_error(err) {
+    console.error(`ERROR(${err.code}): ${err.message}`);
+  }
 
-	navigator.geolocation.watchPosition(geoLoc_success, geoLoc_error, options);
+  var options = {
+    enableHighAccuracy: false,
+    timeout: 5000,
+    maximumAge: 0
+  };
+
+  navigator.geolocation.watchPosition(geoLoc_success, geoLoc_error, options);
 }
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
index c9371a9..785be2a 100644
--- a/templates/conscrit.html.hbs
+++ b/templates/conscrit.html.hbs
@@ -24,7 +24,7 @@
     }
   </style>
 
-  <!-- <script type="text/javascript" src="/utils.js"></script> -->
+  <script type="text/javascript" src="/utils.js"></script>
 </head>
 <body>
   <div id="map"></div><br/>
@@ -36,21 +36,16 @@
     </div>
 
   <script type="text/javascript">
-  const evtSource = new EventSource("/track/{{id}}/events");
-  evtSource.addEventListener("coords", (event) => {
-    console.log(event);
-  });
-//  //////////////////////////////////////////////////////////////////////////////
-//  // SETUP MAP
+    //////////////////////////////////////////////////////////////////////////////
+    // SETUP MAP
 
-//  setup_map();
+    setup_map();
 
-//  //////////////////////////////////////////////////////////////////////////////
-//  // SOCKET
+    //////////////////////////////////////////////////////////////////////////////
+    // EVENT LISTENNING
 
-//  id = "{{id}}";
-//  socket = io({rejectUnauthorized: false, auth: {id: id, type:"conscrit"}});
-//  setup_socket_common();
+    evtSource = new EventSource("/track/{{id}}/events");
+    setup_evtlisten_common();
 
 //  //////////////////////////////////////////////////////////////////////////////
 //  // SETTINGS -- CODE
-- 
2.47.0


From 4f7dda439a31a11e8064a7a109ac1c9ddd60b3b3 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Sun, 2 Jun 2024 11:30:51 +0200
Subject: [PATCH 05/14] vieux self-change

---
 src/main.rs                 | 29 +++++++++++++--
 templates/conscrit.html.hbs |  1 +
 templates/vieux.html.hbs    | 71 +++++++++++++++++--------------------
 3 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 79175b1..169b4f2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -250,13 +250,35 @@ fn tracked_events<'a>(
     }
 }
 
-#[put("/track/<id>?<lat>&<long>")]
+#[put("/track/<id>?<lat>&<long>", rank = 0)]
 fn store_pos(id: &str, lat: f32, long: f32, tracking: &State<Tracking>) {
     if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
         tracked.write().unwrap().pos = (lat, long);
     }
 }
 
+#[put("/track/<id>?<inv>&<col>", rank = 1)]
+fn set_state(id: &str, inv: bool, col: u8, tracking: &State<Tracking>) -> Option<()> {
+    let tracking_lock = tracking.read().unwrap();
+    let state = &mut tracking_lock
+        .get(&id.to_string())
+        .unwrap()
+        .write()
+        .unwrap()
+        .state;
+    if let Vieux {
+        ref mut invisible,
+        ref mut color,
+    } = state
+    {
+        *invisible = inv;
+        *color = col;
+        Some(())
+    } else {
+        None
+    }
+}
+
 #[get("/")]
 fn index() -> &'static str {
     "Hello, world!"
@@ -285,6 +307,9 @@ fn rocket() -> _ {
     rocket::build()
         .attach(Template::fairing())
         .manage(RwLock::new(tracking))
-        .mount("/", routes![index, store_pos, tracked_view, tracked_events])
+        .mount(
+            "/",
+            routes![index, store_pos, tracked_view, tracked_events, set_state],
+        )
         .mount("/", FileServer::from(relative!("static")))
 }
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
index 785be2a..21df987 100644
--- a/templates/conscrit.html.hbs
+++ b/templates/conscrit.html.hbs
@@ -44,6 +44,7 @@
     //////////////////////////////////////////////////////////////////////////////
     // EVENT LISTENNING
 
+    id = "{{id}}";
     evtSource = new EventSource("/track/{{id}}/events");
     setup_evtlisten_common();
 
diff --git a/templates/vieux.html.hbs b/templates/vieux.html.hbs
index 87f2bf1..ecdd215 100644
--- a/templates/vieux.html.hbs
+++ b/templates/vieux.html.hbs
@@ -13,9 +13,6 @@
   integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
   crossorigin=""></script>
 
-  <!-- SOCKET.IO INCLUDE -->
-  <script src="/socket.io/socket.io.js"></script>
-
   <style type="text/css">
     #map { height: 600px; }
     #below {
@@ -37,28 +34,25 @@
             <input type="checkbox" id="invisibility" name="invisibility" checked onclick='sendState()' />
             <label for="invisibility">Invisible</label>
 
-            <input type="checkbox" id="blurred" name="blurred" onclick='sendState()' />
-            <label for="blurred">Brouillé</label></br>
-
-            <input type="radio" id="npc0" name="npc" value=0 onclick='sendState()' />
+            <input type="radio" id="npc0" name="color" value=1 onclick='sendState()' />
             <label for="npc0">Traqueur</label>
-            <input type="radio" id="npc1" name="npc" value=1 checked onclick='sendState()' />
+            <input type="radio" id="npc1" name="color" value=3 checked onclick='sendState()' />
             <label for="npc1"><img src="/icons/3.png" height=15px></label>
-            <input type="radio" id="npc2" name="npc" value=2 checked onclick='sendState()' />
+            <input type="radio" id="npc2" name="color" value=4 checked onclick='sendState()' />
             <label for="npc2"><img src="/icons/4.png" height=15px></label>
-            <input type="radio" id="npc3" name="npc" value=3 checked onclick='sendState()' />
+            <input type="radio" id="npc3" name="color" value=5 checked onclick='sendState()' />
             <label for="npc3"><img src="/icons/5.png" height=15px></label>
-            <input type="radio" id="npc4" name="npc" value=4 checked onclick='sendState()' />
+            <input type="radio" id="npc4" name="color" value=6 checked onclick='sendState()' />
             <label for="npc4"><img src="/icons/6.png" height=15px></label>
-            <input type="radio" id="npc5" name="npc" value=5 checked onclick='sendState()' />
+            <input type="radio" id="npc5" name="color" value=7 checked onclick='sendState()' />
             <label for="npc5"><img src="/icons/7.png" height=15px></label>
-            <input type="radio" id="npc6" name="npc" value=6 checked onclick='sendState()' />
+            <input type="radio" id="npc6" name="color" value=8 checked onclick='sendState()' />
             <label for="npc6"><img src="/icons/8.png" height=15px></label>
-            <input type="radio" id="npc7" name="npc" value=7 checked onclick='sendState()' />
+            <input type="radio" id="npc7" name="color" value=9 checked onclick='sendState()' />
             <label for="npc7"><img src="/icons/9.png" height=15px></label>
-            <input type="radio" id="npc8" name="npc" value=8 checked onclick='sendState()' />
+            <input type="radio" id="npc8" name="color" value=10 checked onclick='sendState()' />
             <label for="npc8"><img src="/icons/10.png" height=15px></label>
-            <input type="radio" id="npc9" name="npc" value=9 checked onclick='sendState()' />
+            <input type="radio" id="npc9" name="color" value=11 checked onclick='sendState()' />
             <label for="npc9"><img src="/icons/11.png" height=15px></label>
         </form><br/>
         
@@ -68,32 +62,33 @@
   </div>
 
   <script type="text/javascript">
-//  //////////////////////////////////////////////////////////////////////////////
-//  // SETUP MAP
+    //////////////////////////////////////////////////////////////////////////////
+    // SETUP MAP
 
-//  setup_map();
-//  
-//  //////////////////////////////////////////////////////////////////////////////
-//  // UPDATE MAP
+    setup_map();
 
-//  id = "{{id}}";
-//  socket = io({rejectUnauthorized: false, auth: {id: id, type:"vieux"}});
-//  setup_socket_common();
+    //////////////////////////////////////////////////////////////////////////////
+    // EVENT LISTENNING
 
-//  //////////////////////////////////////////////////////////////////////////////
-//  // SETTINGS -- State
+    id = "{{id}}";
+    evtSource = new EventSource("/track/{{id}}/events");
+    setup_evtlisten_common();
 
-//  var form = document.querySelector("#state");
-//  function sendState(){
-//      const data = new FormData(form);
-//      var nState = {};
-//      for(entry of data)
-//          nState[entry[0]] = entry[1];
-//      nState.invisibility = "invisibility" in nState;
-//      nState.blurred = "blurred" in nState;
-//      nState.tracker = nState.npc == 0;
-//      socket.emit('changeState', nState);
-//  }
+    //////////////////////////////////////////////////////////////////////////////
+    // SETTINGS -- State
+
+    var form = document.querySelector("#state");
+    function sendState(){
+        const data = new FormData(form);
+        var nState = {};
+        for(entry of data)
+            nState[entry[0]] = entry[1];
+        nState.invisibility = "invisibility" in nState;
+        fetch("/track/{{id}}?inv="+nState.invisibility+
+                           "&col="+nState.color,
+              { method: 'PUT' }
+        );
+    }
 
 //  socket.on('newState', function(state){
 //      document.querySelector("#invisibility").checked = state.invisibility;
-- 
2.47.0


From e289b8850bfb9908d24197a92decc644549b003f Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Sun, 2 Jun 2024 15:22:59 +0200
Subject: [PATCH 06/14] better event sending logic

---
 src/main.rs              | 138 +++++++++++++++++++++++++++++++--------
 static/utils.js          |   2 +-
 templates/vieux.html.hbs |   2 +-
 3 files changed, 114 insertions(+), 28 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 169b4f2..5c7b0b9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,13 +6,16 @@ use rocket::{
     response::stream::{Event, EventStream},
     serde::Serialize,
     tokio::{
-        select,
-        time::{self, Duration},
+        self, select,
+        time::{self, Duration, Instant},
     },
     Shutdown, State,
 };
 use rocket_dyn_templates::{context, Template};
-use std::{collections::HashMap, sync::RwLock};
+use std::{
+    collections::{HashMap, VecDeque},
+    sync::{Arc, RwLock},
+};
 
 enum TrackedState {
     Conscrit {
@@ -130,7 +133,32 @@ fn build_vieux(id: String, name: String) -> Tracked {
     }
 }
 
-type Tracking = RwLock<HashMap<String, RwLock<Tracked>>>;
+struct QueuedEvent {
+    date: Instant,
+    evt: Event,
+}
+
+impl QueuedEvent {
+    fn expired(&self) -> bool {
+        self.date.elapsed() >= Duration::from_millis(100)
+    }
+}
+impl From<Event> for QueuedEvent {
+    fn from(evt: Event) -> QueuedEvent {
+        QueuedEvent {
+            date: Instant::now(),
+            evt,
+        }
+    }
+}
+impl From<QueuedEvent> for Event {
+    fn from(queued_evt: QueuedEvent) -> Event {
+        queued_evt.evt
+    }
+}
+
+type Tracking = Arc<RwLock<HashMap<String, RwLock<Tracked>>>>;
+type TrackingEventQueue = Arc<RwLock<HashMap<String, RwLock<VecDeque<QueuedEvent>>>>>;
 
 #[derive(Serialize)]
 #[serde(crate = "rocket::serde")]
@@ -216,31 +244,39 @@ fn tracked_view(id: &str, gpslog: Option<bool>, tracking: &State<Tracking>) -> O
     }
 }
 
-fn info_to_send(id: &String, tracking: &Tracking) -> Vec<TrackedInfo> {
-    let tracking_lock = tracking.read().unwrap();
-    let watcher = tracking_lock.get(id).unwrap().read().unwrap();
-    let mut infos: Vec<TrackedInfo> = Vec::new();
-    for (_, tracked) in tracking_lock.iter() {
-        if let Some(info) = apparent_info(&watcher, &tracked.read().unwrap()) {
-            infos.push(info);
-        }
+fn evts_to_send(id: &str, evt_queue: &TrackingEventQueue) -> Vec<Event> {
+    let mut evts = Vec::new();
+    for qevt in evt_queue
+        .read()
+        .unwrap()
+        .get(&id.to_string())
+        .unwrap()
+        .read()
+        .unwrap()
+        .iter()
+        .filter(|qevt| !qevt.expired())
+    {
+        evts.push(qevt.evt.clone());
     }
-    infos
+    evts
 }
 
 #[get("/track/<id>/events")]
 fn tracked_events<'a>(
     id: &'a str,
-    tracking: &'a State<Tracking>,
+    evt_queue: &'a State<TrackingEventQueue>,
     mut shutdown: Shutdown,
 ) -> Option<EventStream![Event + 'a]> {
-    if tracking.read().unwrap().contains_key(&id.to_string()) {
+    if evt_queue.read().unwrap().contains_key(&id.to_string()) {
         Some(EventStream! {
-            let mut interval = time::interval(Duration::from_secs(5));
+            let mut interval = time::interval(Duration::from_millis(100));
             loop {
                 select!{
-                    _ = interval.tick() =>
-                        yield Event::json(&info_to_send(&id.to_string(), &tracking)).event("coords"),
+                    _ = interval.tick() =>{
+                        for evt in evts_to_send(id, evt_queue){
+                            yield evt;
+                        }
+                    },
                     _ = &mut shutdown => break
                 }
             }
@@ -250,14 +286,14 @@ fn tracked_events<'a>(
     }
 }
 
-#[put("/track/<id>?<lat>&<long>", rank = 0)]
+#[put("/track/<id>/pos?<lat>&<long>")]
 fn store_pos(id: &str, lat: f32, long: f32, tracking: &State<Tracking>) {
     if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
         tracked.write().unwrap().pos = (lat, long);
     }
 }
 
-#[put("/track/<id>?<inv>&<col>", rank = 1)]
+#[put("/track/<id>/state?<inv>&<col>")]
 fn set_state(id: &str, inv: bool, col: u8, tracking: &State<Tracking>) -> Option<()> {
     let tracking_lock = tracking.read().unwrap();
     let state = &mut tracking_lock
@@ -284,9 +320,39 @@ fn index() -> &'static str {
     "Hello, world!"
 }
 
+fn send_coords(tracking: &Tracking, evt_queue: &TrackingEventQueue) {
+    let tracking_lock = tracking.read().unwrap();
+    for (id, queue) in evt_queue.read().unwrap().iter() {
+        let watcher = tracking_lock.get(id).unwrap().read().unwrap();
+        let mut infos: Vec<TrackedInfo> = Vec::new();
+        for (_, tracked) in tracking_lock.iter() {
+            if let Some(info) = apparent_info(&watcher, &tracked.read().unwrap()) {
+                infos.push(info);
+            }
+        }
+        queue
+            .write()
+            .unwrap()
+            .push_back(Event::json(&infos).event("coords").into());
+    }
+}
+
+fn clean_expired_evt(evt_queues: &TrackingEventQueue) {
+    for (_, queue) in evt_queues.read().unwrap().iter() {
+        let queue = &mut queue.write().unwrap();
+        while let Some(queued_evt) = queue.front() {
+            if queued_evt.expired() {
+                queue.pop_front();
+            } else {
+                break;
+            }
+        }
+    }
+}
+
 #[launch]
-fn rocket() -> _ {
-    let tracking = HashMap::<String, RwLock<Tracked>>::from([
+async fn rocket() -> _ {
+    let tracking: Tracking = Arc::new(RwLock::new(HashMap::from([
         (
             "team00".to_string(),
             RwLock::new(build_conscrit("team00".to_string(), "Équipe 0".to_string())),
@@ -303,13 +369,33 @@ fn rocket() -> _ {
             "npc1".to_string(),
             RwLock::new(build_vieux("npc1".to_string(), "PNJ 1".to_string())),
         ),
-    ]);
-    rocket::build()
+    ])));
+    let evt_queue: TrackingEventQueue = Arc::new(RwLock::new(
+        tracking
+            .read()
+            .unwrap()
+            .iter()
+            .map(|(id, _)| (id.clone(), RwLock::new(VecDeque::new())))
+            .collect(),
+    ));
+    let rocket = rocket::build()
         .attach(Template::fairing())
-        .manage(RwLock::new(tracking))
+        .manage(tracking.clone())
+        .manage(evt_queue.clone())
         .mount(
             "/",
             routes![index, store_pos, tracked_view, tracked_events, set_state],
         )
-        .mount("/", FileServer::from(relative!("static")))
+        .mount("/", FileServer::from(relative!("static")));
+    tokio::spawn(async move {
+        let mut clean_interval = time::interval(Duration::from_millis(500));
+        let mut coord_interval = time::interval(Duration::from_millis(3000));
+        loop {
+            select! {
+                _ = coord_interval.tick() => send_coords(&tracking, &evt_queue),
+                _ = clean_interval.tick() => clean_expired_evt(&evt_queue),
+            }
+        }
+    });
+    rocket
 }
diff --git a/static/utils.js b/static/utils.js
index 54d93b7..4830334 100644
--- a/static/utils.js
+++ b/static/utils.js
@@ -125,7 +125,7 @@ function setup_geoLoc(){
   const requestOptions = { method: 'PUT' };
 
   function geoLoc_success(pos) {
-    fetch("/log/"+id+"?lat="+pos.coords.latitude+"&long="+pos.coords.longitude, requestOptions);
+    fetch("/log/"+id+"/pos?lat="+pos.coords.latitude+"&long="+pos.coords.longitude, requestOptions);
   }
 
   function geoLoc_error(err) {
diff --git a/templates/vieux.html.hbs b/templates/vieux.html.hbs
index ecdd215..2ba3542 100644
--- a/templates/vieux.html.hbs
+++ b/templates/vieux.html.hbs
@@ -84,7 +84,7 @@
         for(entry of data)
             nState[entry[0]] = entry[1];
         nState.invisibility = "invisibility" in nState;
-        fetch("/track/{{id}}?inv="+nState.invisibility+
+        fetch("/track/{{id}}/state?inv="+nState.invisibility+
                            "&col="+nState.color,
               { method: 'PUT' }
         );
-- 
2.47.0


From 5728936d4d93b462b469ebfc6e343733cd467671 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Sun, 2 Jun 2024 16:14:44 +0200
Subject: [PATCH 07/14] rapid feedback

---
 src/main.rs                 | 73 +++++++++++++++++++++++++++----------
 static/utils.js             | 22 +++++++----
 templates/conscrit.html.hbs |  4 +-
 templates/vieux.html.hbs    |  4 +-
 4 files changed, 72 insertions(+), 31 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 5c7b0b9..f6a4798 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -165,34 +165,46 @@ type TrackingEventQueue = Arc<RwLock<HashMap<String, RwLock<VecDeque<QueuedEvent
 struct TrackedInfo {
     name: String,
     pos: (f32, f32),
-    me: bool,
     color: u8,
 }
 
+#[derive(Serialize)]
+#[serde(crate = "rocket::serde")]
+struct AdminTrackedInfo {
+    name: String,
+    pos: (f32, f32),
+    color: u8,
+}
+
+impl From<AdminTrackedInfo> for TrackedInfo {
+    fn from(admin_info: AdminTrackedInfo) -> TrackedInfo {
+        TrackedInfo {
+            name: admin_info.name,
+            pos: admin_info.pos,
+            color: admin_info.color,
+        }
+    }
+}
+
 fn base_view(team: &Tracked) -> TrackedInfo {
     TrackedInfo {
         name: team.name.clone(),
         pos: team.pos,
-        me: false,
         color: team.state.color(),
     }
 }
 
-fn admin_view(team: &Tracked) -> TrackedInfo {
-    TrackedInfo {
+fn admin_view(team: &Tracked) -> AdminTrackedInfo {
+    AdminTrackedInfo {
         name: team.name.clone(),
         pos: team.pos,
-        me: false,
         color: team.state.admin_color(),
     }
 }
 
 fn apparent_info(watcher: &Tracked, team: &Tracked) -> Option<TrackedInfo> {
     if watcher.id == team.id {
-        Some(TrackedInfo {
-            me: true,
-            ..admin_view(team)
-        })
+        None
     } else if let Conscrit {
         captured, mallette, ..
     } = watcher.state
@@ -221,7 +233,7 @@ fn apparent_info(watcher: &Tracked, team: &Tracked) -> Option<TrackedInfo> {
             }
         }
     } else {
-        Some(admin_view(team))
+        Some(admin_view(team).into())
     }
 }
 
@@ -264,16 +276,19 @@ fn evts_to_send(id: &str, evt_queue: &TrackingEventQueue) -> Vec<Event> {
 #[get("/track/<id>/events")]
 fn tracked_events<'a>(
     id: &'a str,
+    tracking: &State<Tracking>,
     evt_queue: &'a State<TrackingEventQueue>,
     mut shutdown: Shutdown,
 ) -> Option<EventStream![Event + 'a]> {
     if evt_queue.read().unwrap().contains_key(&id.to_string()) {
+        state_update(&tracking.read().unwrap().get(&id.to_string()).unwrap().read().unwrap(), &evt_queue);
         Some(EventStream! {
             let mut interval = time::interval(Duration::from_millis(100));
             loop {
                 select!{
                     _ = interval.tick() =>{
                         for evt in evts_to_send(id, evt_queue){
+                            //println!("{:?}", evt);
                             yield evt;
                         }
                     },
@@ -286,29 +301,49 @@ fn tracked_events<'a>(
     }
 }
 
+fn state_update(tracked: &Tracked, evt_queues: &TrackingEventQueue) {
+    evt_queues
+        .read()
+        .unwrap()
+        .get(&tracked.id)
+        .unwrap()
+        .write()
+        .unwrap()
+        .push_back(Event::json(&admin_view(tracked)).event("self_info").into());
+}
+
 #[put("/track/<id>/pos?<lat>&<long>")]
-fn store_pos(id: &str, lat: f32, long: f32, tracking: &State<Tracking>) {
+fn store_pos(
+    id: &str,
+    lat: f32,
+    long: f32,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+) {
     if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
         tracked.write().unwrap().pos = (lat, long);
+        state_update(&tracked.read().unwrap(), &evt_queues);
     }
 }
 
 #[put("/track/<id>/state?<inv>&<col>")]
-fn set_state(id: &str, inv: bool, col: u8, tracking: &State<Tracking>) -> Option<()> {
+fn set_state(
+    id: &str,
+    inv: bool,
+    col: u8,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+) -> Option<()> {
     let tracking_lock = tracking.read().unwrap();
-    let state = &mut tracking_lock
-        .get(&id.to_string())
-        .unwrap()
-        .write()
-        .unwrap()
-        .state;
+    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
     if let Vieux {
         ref mut invisible,
         ref mut color,
-    } = state
+    } = tracked.state
     {
         *invisible = inv;
         *color = col;
+        state_update(&tracked, &evt_queues);
         Some(())
     } else {
         None
diff --git a/static/utils.js b/static/utils.js
index 4830334..fce0bab 100644
--- a/static/utils.js
+++ b/static/utils.js
@@ -1,5 +1,8 @@
 var evtsource;
 var markers = [];
+var self_marker;
+var name;
+var id;
 
 var CircleIcon = L.Icon.extend({
     options: {
@@ -73,36 +76,39 @@ function setup_map(){
   }).addTo(map);
 
   L.polyline(map_border, {color: 'red'}).addTo(map);
+  self_marker = L.marker([0,0], {"icon": icons[0] }).addTo(map);
+  self_marker.setZIndexOffset(1000);
+  self_marker.bindPopup(name);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // EVENT LISTENNING
 
 function setup_evtlisten_common(){
+  evtSource = new EventSource("/track/"+id+"/events");
   evtSource.addEventListener("coords", (event) => {
     const data = JSON.parse(event.data);
-    console.log(data);
     var i = 0;
     for (tracked of data) {
       if (i == markers.length) {
         markers.push(L.marker([0,0], {"icon": icons[0] }).addTo(map));
         markers[i].bindPopup("");
+        markers[i].setZIndexOffset(0);
       }
       markers[i].setLatLng(tracked.pos);
       markers[i].setPopupContent(tracked.name);
-      if (tracked.me) {
-        markers[i].setIcon(self_icons[tracked.color]);
-        markers[i].setZIndexOffset(1000);
-      } else {
-        markers[i].setIcon(icons[tracked.color]);
-        markers[i].setZIndexOffset(0);
-      }
+      markers[i].setIcon(icons[tracked.color]);
       ++i;
     }
     for (; i < markers.length; ++i) {
       markers[i].setLatLng([0,0]);
     }
   });
+  evtSource.addEventListener("self_info", (event) => {
+    const data = JSON.parse(event.data);
+    self_marker.setLatLng(data.pos);
+    self_marker.setIcon(self_icons[data.color]);
+  });
 
   //socket.on("popup", function(data){
   //  alert(data.content);
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
index 21df987..ebe0dfa 100644
--- a/templates/conscrit.html.hbs
+++ b/templates/conscrit.html.hbs
@@ -36,6 +36,8 @@
     </div>
 
   <script type="text/javascript">
+    id = "{{id}}";
+    name = "{{name}}";
     //////////////////////////////////////////////////////////////////////////////
     // SETUP MAP
 
@@ -44,8 +46,6 @@
     //////////////////////////////////////////////////////////////////////////////
     // EVENT LISTENNING
 
-    id = "{{id}}";
-    evtSource = new EventSource("/track/{{id}}/events");
     setup_evtlisten_common();
 
 //  //////////////////////////////////////////////////////////////////////////////
diff --git a/templates/vieux.html.hbs b/templates/vieux.html.hbs
index 2ba3542..291e169 100644
--- a/templates/vieux.html.hbs
+++ b/templates/vieux.html.hbs
@@ -62,6 +62,8 @@
   </div>
 
   <script type="text/javascript">
+    id = "{{id}}";
+    name = "{{name}}";
     //////////////////////////////////////////////////////////////////////////////
     // SETUP MAP
 
@@ -70,8 +72,6 @@
     //////////////////////////////////////////////////////////////////////////////
     // EVENT LISTENNING
 
-    id = "{{id}}";
-    evtSource = new EventSource("/track/{{id}}/events");
     setup_evtlisten_common();
 
     //////////////////////////////////////////////////////////////////////////////
-- 
2.47.0


From ed3aa5abc685bbe4111c321e1e9bf89c9c148c59 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Mon, 3 Jun 2024 13:26:58 +0200
Subject: [PATCH 08/14] no need of nightly

---
 shell.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/shell.nix b/shell.nix
index 51e7db0..eaa9a72 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,7 +1,4 @@
 { pkgs ? (import <nixpkgs>) { }, lib ? pkgs.lib}:
-let
-  fenix = import (fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz") { };
-in
 pkgs.mkShell {
-  buildInputs = with fenix.latest; [ cargo rustc rustfmt ];
+  buildInputs = with pkgs; [ cargo rustc rustfmt ];
 }
-- 
2.47.0


From 6e0e9ae4a506b41dc1478b57402082d8e5125185 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 5 Jun 2024 16:50:13 +0200
Subject: [PATCH 09/14] state reception

---
 src/main.rs                 | 29 +++++++++++++++---
 static/utils.js             |  4 +++
 templates/conscrit.html.hbs | 38 +++++++++--------------
 templates/vieux.html.hbs    | 61 ++++++++++++++++---------------------
 4 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index f6a4798..06ea57d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,6 +17,8 @@ use std::{
     sync::{Arc, RwLock},
 };
 
+#[derive(Serialize, Clone)]
+#[serde(crate = "rocket::serde")]
 enum TrackedState {
     Conscrit {
         invisible: bool,
@@ -172,8 +174,10 @@ struct TrackedInfo {
 #[serde(crate = "rocket::serde")]
 struct AdminTrackedInfo {
     name: String,
+    id: String,
     pos: (f32, f32),
     color: u8,
+    state: TrackedState,
 }
 
 impl From<AdminTrackedInfo> for TrackedInfo {
@@ -197,8 +201,10 @@ fn base_view(team: &Tracked) -> TrackedInfo {
 fn admin_view(team: &Tracked) -> AdminTrackedInfo {
     AdminTrackedInfo {
         name: team.name.clone(),
+        id: team.id.clone(),
         pos: team.pos,
         color: team.state.admin_color(),
+        state: team.state.clone(),
     }
 }
 
@@ -237,8 +243,13 @@ fn apparent_info(watcher: &Tracked, team: &Tracked) -> Option<TrackedInfo> {
     }
 }
 
-#[get("/track/<id>?<gpslog>")]
-fn tracked_view(id: &str, gpslog: Option<bool>, tracking: &State<Tracking>) -> Option<Template> {
+#[get("/track/<id>?<gpslog>&<dbg>")]
+fn tracked_view(
+    id: &str,
+    gpslog: Option<bool>,
+    dbg: Option<bool>,
+    tracking: &State<Tracking>,
+) -> Option<Template> {
     if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
         Some(Template::render(
             match tracked.read().unwrap().state {
@@ -248,7 +259,8 @@ fn tracked_view(id: &str, gpslog: Option<bool>, tracking: &State<Tracking>) -> O
             context! {
                 name: &tracked.read().unwrap().name,
                 id: &id,
-                gpslog: gpslog.unwrap_or(true)
+                gpslog: gpslog.unwrap_or(true),
+                dbg: dbg.unwrap_or(false),
             },
         ))
     } else {
@@ -281,7 +293,16 @@ fn tracked_events<'a>(
     mut shutdown: Shutdown,
 ) -> Option<EventStream![Event + 'a]> {
     if evt_queue.read().unwrap().contains_key(&id.to_string()) {
-        state_update(&tracking.read().unwrap().get(&id.to_string()).unwrap().read().unwrap(), &evt_queue);
+        state_update(
+            &tracking
+                .read()
+                .unwrap()
+                .get(&id.to_string())
+                .unwrap()
+                .read()
+                .unwrap(),
+            &evt_queue,
+        );
         Some(EventStream! {
             let mut interval = time::interval(Duration::from_millis(100));
             loop {
diff --git a/static/utils.js b/static/utils.js
index fce0bab..61ee096 100644
--- a/static/utils.js
+++ b/static/utils.js
@@ -3,6 +3,7 @@ var markers = [];
 var self_marker;
 var name;
 var id;
+var dbg;
 
 var CircleIcon = L.Icon.extend({
     options: {
@@ -88,6 +89,7 @@ function setup_evtlisten_common(){
   evtSource = new EventSource("/track/"+id+"/events");
   evtSource.addEventListener("coords", (event) => {
     const data = JSON.parse(event.data);
+    if(dbg) console.log('coords: ', data);
     var i = 0;
     for (tracked of data) {
       if (i == markers.length) {
@@ -106,8 +108,10 @@ function setup_evtlisten_common(){
   });
   evtSource.addEventListener("self_info", (event) => {
     const data = JSON.parse(event.data);
+    if(dbg) console.log('self: ', data);
     self_marker.setLatLng(data.pos);
     self_marker.setIcon(self_icons[data.color]);
+    self_state_hook(data.state);
   });
 
   //socket.on("popup", function(data){
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
index ebe0dfa..fe1e978 100644
--- a/templates/conscrit.html.hbs
+++ b/templates/conscrit.html.hbs
@@ -38,36 +38,28 @@
   <script type="text/javascript">
     id = "{{id}}";
     name = "{{name}}";
-    //////////////////////////////////////////////////////////////////////////////
-    // SETUP MAP
+    dbg = {{dbg}};
 
     setup_map();
+//  {{#if gpslog}}setup_geoLoc();{{/if}}
 
     //////////////////////////////////////////////////////////////////////////////
     // EVENT LISTENNING
 
+    function self_state_hook(state){
+        var code_buttons = "";
+        if(state.Conscrit.invisibility_codes > 0)//onclick="socket.emit('useCode', 'invisibility')"
+            code_buttons += `<button>
+                                Invisibilité
+                            </button>`;
+        if(state.Conscrit.blur_codes > 0)//onclick="socket.emit('useCode', 'blurred')"
+            code_buttons += `<button>
+                                Brouillage
+                            </button>`;
+        document.getElementById(`codes`).innerHTML = code_buttons;
+    };
+
     setup_evtlisten_common();
-
-//  //////////////////////////////////////////////////////////////////////////////
-//  // SETTINGS -- CODE
-
-//  socket.on('setCodes', function(codes){
-//      var code_buttons = "";
-//      if(codes.invisibility > 0)
-//          code_buttons += `<button onclick="socket.emit('useCode', 'invisibility')">
-//                              Invisibilité
-//                          </button>`;
-//      if(codes.blurred > 0)
-//          code_buttons += `<button onclick="socket.emit('useCode', 'blurred')">
-//                              Brouillage
-//                          </button>`;
-//      document.getElementById(`codes`).innerHTML = code_buttons;
-//  });
-
-//  //////////////////////////////////////////////////////////////////////////////
-//  // GEOLOCALISATION
-
-//  if({{gpslog}}) setup_geoLoc();
   </script>
 </body>
 </html>
diff --git a/templates/vieux.html.hbs b/templates/vieux.html.hbs
index 291e169..9f92b9e 100644
--- a/templates/vieux.html.hbs
+++ b/templates/vieux.html.hbs
@@ -34,25 +34,25 @@
             <input type="checkbox" id="invisibility" name="invisibility" checked onclick='sendState()' />
             <label for="invisibility">Invisible</label>
 
-            <input type="radio" id="npc0" name="color" value=1 onclick='sendState()' />
+            <input type="radio" id="npc1" name="color" value=1 onclick='sendState()' />
             <label for="npc0">Traqueur</label>
-            <input type="radio" id="npc1" name="color" value=3 checked onclick='sendState()' />
+            <input type="radio" id="npc3" name="color" value=3 checked onclick='sendState()' />
             <label for="npc1"><img src="/icons/3.png" height=15px></label>
-            <input type="radio" id="npc2" name="color" value=4 checked onclick='sendState()' />
+            <input type="radio" id="npc4" name="color" value=4 checked onclick='sendState()' />
             <label for="npc2"><img src="/icons/4.png" height=15px></label>
-            <input type="radio" id="npc3" name="color" value=5 checked onclick='sendState()' />
+            <input type="radio" id="npc5" name="color" value=5 checked onclick='sendState()' />
             <label for="npc3"><img src="/icons/5.png" height=15px></label>
-            <input type="radio" id="npc4" name="color" value=6 checked onclick='sendState()' />
+            <input type="radio" id="npc6" name="color" value=6 checked onclick='sendState()' />
             <label for="npc4"><img src="/icons/6.png" height=15px></label>
-            <input type="radio" id="npc5" name="color" value=7 checked onclick='sendState()' />
+            <input type="radio" id="npc7" name="color" value=7 checked onclick='sendState()' />
             <label for="npc5"><img src="/icons/7.png" height=15px></label>
-            <input type="radio" id="npc6" name="color" value=8 checked onclick='sendState()' />
+            <input type="radio" id="npc8" name="color" value=8 checked onclick='sendState()' />
             <label for="npc6"><img src="/icons/8.png" height=15px></label>
-            <input type="radio" id="npc7" name="color" value=9 checked onclick='sendState()' />
+            <input type="radio" id="npc9" name="color" value=9 checked onclick='sendState()' />
             <label for="npc7"><img src="/icons/9.png" height=15px></label>
-            <input type="radio" id="npc8" name="color" value=10 checked onclick='sendState()' />
+            <input type="radio" id="npc10" name="color" value=10 checked onclick='sendState()' />
             <label for="npc8"><img src="/icons/10.png" height=15px></label>
-            <input type="radio" id="npc9" name="color" value=11 checked onclick='sendState()' />
+            <input type="radio" id="npc11" name="color" value=11 checked onclick='sendState()' />
             <label for="npc9"><img src="/icons/11.png" height=15px></label>
         </form><br/>
         
@@ -64,19 +64,14 @@
   <script type="text/javascript">
     id = "{{id}}";
     name = "{{name}}";
-    //////////////////////////////////////////////////////////////////////////////
-    // SETUP MAP
+    dbg = {{dbg}};
 
     setup_map();
+//  {{#if gpslog}}setup_geoLoc();{{/if}}
 
     //////////////////////////////////////////////////////////////////////////////
     // EVENT LISTENNING
 
-    setup_evtlisten_common();
-
-    //////////////////////////////////////////////////////////////////////////////
-    // SETTINGS -- State
-
     var form = document.querySelector("#state");
     function sendState(){
         const data = new FormData(form);
@@ -90,25 +85,21 @@
         );
     }
 
-//  socket.on('newState', function(state){
-//      document.querySelector("#invisibility").checked = state.invisibility;
-//      document.querySelector("#blurred").checked = state.blurred;
-//      document.querySelector("#npc0").checked = state.npc == 0;
-//      document.querySelector("#npc1").checked = state.npc == 1;
-//      document.querySelector("#npc2").checked = state.npc == 2;
-//      document.querySelector("#npc3").checked = state.npc == 3;
-//      document.querySelector("#npc4").checked = state.npc == 4;
-//      document.querySelector("#npc5").checked = state.npc == 5;
-//      document.querySelector("#npc6").checked = state.npc == 6;
-//      document.querySelector("#npc7").checked = state.npc == 7;
-//      document.querySelector("#npc8").checked = state.npc == 8;
-//      document.querySelector("#npc9").checked = state.npc == 9;
-//  });
+    function self_state_hook(state){
+        document.querySelector("#invisibility").checked = state.Vieux.invisible;
+        document.querySelector("#npc1").checked = state.Vieux.color == 1;
+        document.querySelector("#npc3").checked = state.Vieux.color == 3;
+        document.querySelector("#npc4").checked = state.Vieux.color == 4;
+        document.querySelector("#npc5").checked = state.Vieux.color == 5;
+        document.querySelector("#npc6").checked = state.Vieux.color == 6;
+        document.querySelector("#npc7").checked = state.Vieux.color == 7;
+        document.querySelector("#npc8").checked = state.Vieux.color == 8;
+        document.querySelector("#npc9").checked = state.Vieux.color == 9;
+        document.querySelector("#npc10").checked = state.Vieux.color == 10;
+        document.querySelector("#npc11").checked = state.Vieux.color == 11;
+    };
 
-//  //////////////////////////////////////////////////////////////////////////////
-//  // GEOLOCALISATION
-
-//  if({{gpslog}}) setup_geoLoc();
+    setup_evtlisten_common();
   </script>
 </body>
 </html>
-- 
2.47.0


From a00df617c52efb9c6c31b602b164c54c1b0e8082 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Mon, 10 Jun 2024 09:43:35 +0200
Subject: [PATCH 10/14] feat(admin): admin page

---
 src/main.rs                 | 151 +++++++++++++++++++-----
 static/utils.js             |   3 +
 templates/admin.html        | 166 ---------------------------
 templates/admin.html.hbs    | 221 ++++++++++++++++++++++++++++++++++++
 templates/conscrit.html.hbs |   1 +
 templates/vieux.html.hbs    |   1 +
 6 files changed, 346 insertions(+), 197 deletions(-)
 delete mode 100644 templates/admin.html
 create mode 100644 templates/admin.html.hbs

diff --git a/src/main.rs b/src/main.rs
index 06ea57d..7a56a54 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,7 @@ use rand::Rng;
 use rocket::{
     fs::{relative, FileServer},
     response::stream::{Event, EventStream},
-    serde::Serialize,
+    serde::{json::Json, Deserialize, Serialize},
     tokio::{
         self, select,
         time::{self, Duration, Instant},
@@ -17,7 +17,7 @@ use std::{
     sync::{Arc, RwLock},
 };
 
-#[derive(Serialize, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 #[serde(crate = "rocket::serde")]
 enum TrackedState {
     Conscrit {
@@ -161,6 +161,8 @@ impl From<QueuedEvent> for Event {
 
 type Tracking = Arc<RwLock<HashMap<String, RwLock<Tracked>>>>;
 type TrackingEventQueue = Arc<RwLock<HashMap<String, RwLock<VecDeque<QueuedEvent>>>>>;
+type AdminEventQueue = Arc<RwLock<VecDeque<QueuedEvent>>>;
+type AdminKey = String;
 
 #[derive(Serialize)]
 #[serde(crate = "rocket::serde")]
@@ -268,47 +270,33 @@ fn tracked_view(
     }
 }
 
-fn evts_to_send(id: &str, evt_queue: &TrackingEventQueue) -> Vec<Event> {
-    let mut evts = Vec::new();
-    for qevt in evt_queue
-        .read()
-        .unwrap()
-        .get(&id.to_string())
-        .unwrap()
+fn evts_to_send(evt_queue: &RwLock<VecDeque<QueuedEvent>>) -> Vec<Event> {
+    evt_queue
         .read()
         .unwrap()
         .iter()
         .filter(|qevt| !qevt.expired())
-    {
-        evts.push(qevt.evt.clone());
-    }
-    evts
+        .map(|qevt| qevt.evt.clone())
+        .collect()
+}
+
+fn evts_for(id: &str, evt_queues: &TrackingEventQueue) -> Vec<Event> {
+    evts_to_send(evt_queues.read().unwrap().get(&id.to_string()).unwrap())
 }
 
 #[get("/track/<id>/events")]
 fn tracked_events<'a>(
     id: &'a str,
-    tracking: &State<Tracking>,
     evt_queue: &'a State<TrackingEventQueue>,
     mut shutdown: Shutdown,
 ) -> Option<EventStream![Event + 'a]> {
     if evt_queue.read().unwrap().contains_key(&id.to_string()) {
-        state_update(
-            &tracking
-                .read()
-                .unwrap()
-                .get(&id.to_string())
-                .unwrap()
-                .read()
-                .unwrap(),
-            &evt_queue,
-        );
         Some(EventStream! {
             let mut interval = time::interval(Duration::from_millis(100));
             loop {
                 select!{
                     _ = interval.tick() =>{
-                        for evt in evts_to_send(id, evt_queue){
+                        for evt in evts_for(id, evt_queue){
                             //println!("{:?}", evt);
                             yield evt;
                         }
@@ -322,7 +310,79 @@ fn tracked_events<'a>(
     }
 }
 
-fn state_update(tracked: &Tracked, evt_queues: &TrackingEventQueue) {
+#[get("/admin?<tok>&<dbg>")]
+fn admin_page(
+    tok: Option<AdminKey>,
+    dbg: Option<bool>,
+    admin_key: &State<AdminKey>,
+) -> Option<Template> {
+    if tok == Some(admin_key.to_string()) {
+        Some(Template::render(
+            "admin",
+            context! { tok: tok.unwrap(), dbg: dbg.unwrap_or(false) },
+        ))
+    } else {
+        None
+    }
+}
+
+#[patch("/admin/<id>?<tok>", data = "<nstate>")]
+fn admin_set_state(
+    tok: Option<AdminKey>,
+    id: &str,
+    admin_key: &State<AdminKey>,
+    nstate: Json<TrackedState>,
+    tracking: &State<Tracking>,
+    evt_queue: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) -> Option<()> {
+    if tok == Some(admin_key.to_string()) {
+        let tracking_lock = tracking.read().unwrap();
+        let tracked = tracking_lock.get(&id.to_string()).unwrap();
+        tracked.write().unwrap().state = nstate.into_inner();
+        state_update(&tracked.read().unwrap(), &evt_queue, &admin_queue);
+        Some(())
+    } else {
+        None
+    }
+}
+
+#[get("/admin/events?<tok>")]
+fn admin_events<'a>(
+    tok: Option<AdminKey>,
+    admin_key: &State<AdminKey>,
+    admin_queue: &'a State<AdminEventQueue>,
+    tracking: &State<Tracking>,
+    mut shutdown: Shutdown,
+) -> Option<EventStream![Event + 'a]> {
+    if tok == Some(admin_key.to_string()) {
+        let full_info: Vec<AdminTrackedInfo> = tracking
+            .read()
+            .unwrap()
+            .iter()
+            .map(|(_, tracked)| admin_view(&tracked.read().unwrap()))
+            .collect();
+        Some(EventStream! {
+            yield Event::json(&full_info).event("full_update");
+            let mut interval = time::interval(Duration::from_millis(100));
+            loop {
+                select!{
+                    _ = interval.tick() =>{
+                        for evt in evts_to_send(admin_queue){
+                            //println!("{:?}", evt);
+                            yield evt;
+                        }
+                    },
+                    _ = &mut shutdown => break
+                }
+            }
+        })
+    } else {
+        None
+    }
+}
+
+fn state_update(tracked: &Tracked, evt_queues: &TrackingEventQueue, admin_queue: &AdminEventQueue) {
     evt_queues
         .read()
         .unwrap()
@@ -331,6 +391,10 @@ fn state_update(tracked: &Tracked, evt_queues: &TrackingEventQueue) {
         .write()
         .unwrap()
         .push_back(Event::json(&admin_view(tracked)).event("self_info").into());
+    admin_queue
+        .write()
+        .unwrap()
+        .push_back(Event::json(&admin_view(tracked)).event("update").into());
 }
 
 #[put("/track/<id>/pos?<lat>&<long>")]
@@ -340,10 +404,11 @@ fn store_pos(
     long: f32,
     tracking: &State<Tracking>,
     evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
 ) {
     if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
         tracked.write().unwrap().pos = (lat, long);
-        state_update(&tracked.read().unwrap(), &evt_queues);
+        state_update(&tracked.read().unwrap(), &evt_queues, &admin_queue);
     }
 }
 
@@ -354,6 +419,7 @@ fn set_state(
     col: u8,
     tracking: &State<Tracking>,
     evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
 ) -> Option<()> {
     let tracking_lock = tracking.read().unwrap();
     let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
@@ -364,7 +430,7 @@ fn set_state(
     {
         *invisible = inv;
         *color = col;
-        state_update(&tracked, &evt_queues);
+        state_update(&tracked, &evt_queues, &admin_queue);
         Some(())
     } else {
         None
@@ -393,7 +459,7 @@ fn send_coords(tracking: &Tracking, evt_queue: &TrackingEventQueue) {
     }
 }
 
-fn clean_expired_evt(evt_queues: &TrackingEventQueue) {
+fn clean_expired_evt(evt_queues: &TrackingEventQueue, admin_queue: &AdminEventQueue) {
     for (_, queue) in evt_queues.read().unwrap().iter() {
         let queue = &mut queue.write().unwrap();
         while let Some(queued_evt) = queue.front() {
@@ -404,10 +470,19 @@ fn clean_expired_evt(evt_queues: &TrackingEventQueue) {
             }
         }
     }
+    let queue = &mut admin_queue.write().unwrap();
+    while let Some(queued_evt) = queue.front() {
+        if queued_evt.expired() {
+            queue.pop_front();
+        } else {
+            break;
+        }
+    }
 }
 
 #[launch]
 async fn rocket() -> _ {
+    //TODO: read a config file on release
     let tracking: Tracking = Arc::new(RwLock::new(HashMap::from([
         (
             "team00".to_string(),
@@ -434,13 +509,27 @@ async fn rocket() -> _ {
             .map(|(id, _)| (id.clone(), RwLock::new(VecDeque::new())))
             .collect(),
     ));
+    let admin_evt_queue: AdminEventQueue = Arc::new(RwLock::new(VecDeque::new()));
+    let key: AdminKey = "root".to_string(); //TODO : random on release
+    println!("Admin token: {}", key);
     let rocket = rocket::build()
         .attach(Template::fairing())
         .manage(tracking.clone())
         .manage(evt_queue.clone())
+        .manage(admin_evt_queue.clone())
+        .manage(key)
         .mount(
             "/",
-            routes![index, store_pos, tracked_view, tracked_events, set_state],
+            routes![
+                index,
+                store_pos,
+                tracked_view,
+                tracked_events,
+                set_state,
+                admin_page,
+                admin_events,
+                admin_set_state,
+            ],
         )
         .mount("/", FileServer::from(relative!("static")));
     tokio::spawn(async move {
@@ -449,7 +538,7 @@ async fn rocket() -> _ {
         loop {
             select! {
                 _ = coord_interval.tick() => send_coords(&tracking, &evt_queue),
-                _ = clean_interval.tick() => clean_expired_evt(&evt_queue),
+                _ = clean_interval.tick() => clean_expired_evt(&evt_queue, &admin_evt_queue),
             }
         }
     });
diff --git a/static/utils.js b/static/utils.js
index 61ee096..bc3ce7d 100644
--- a/static/utils.js
+++ b/static/utils.js
@@ -77,6 +77,9 @@ function setup_map(){
   }).addTo(map);
 
   L.polyline(map_border, {color: 'red'}).addTo(map);
+}
+
+function setup_map_self(){
   self_marker = L.marker([0,0], {"icon": icons[0] }).addTo(map);
   self_marker.setZIndexOffset(1000);
   self_marker.bindPopup(name);
diff --git a/templates/admin.html b/templates/admin.html
deleted file mode 100644
index 17ae196..0000000
--- a/templates/admin.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Traque | Client admin</title>
-
-	<!-- LEAFLET INCLUDE -->
-	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
-	integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
-	crossorigin=""/>
-	<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
-	integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
-	crossorigin=""></script>
-
-	<!-- SOCKET.IO INCLUDE -->
-	<script src="/socket.io/socket.io.js"></script>
-
-	<style type="text/css">
-		#map {
-            position: fixed;
-            top: 0px;
-            left: 0px;
-            height: 100%;
-            width: 50%;
-        }
-        #right {
-            position: fixed;
-            width: 49%;
-            height: 98%;
-            top: 1%;
-            right: 0.5%;
-        }
-
-        .vieux { color: DarkOrchid; }
-
-        .tableFixHead          { overflow: auto; height: 60%; }
-        .tableFixHead thead th { position: sticky; top: 0; z-index: 1; }
-        table  { border-collapse: collapse; width: 100%; }
-        th, td { padding: 8px 16px; }
-        th     { background: Grey; }
-        tr:nth-child(even) { background-color: Silver; }
-	</style>
-
-	<script type="text/javascript" src="utils.js"></script>
-</head>
-<body>
-	<div id="map"></div>
-
-    <div id="right">
-        <div class="tableFixHead">
-        <table>
-            <thead><tr>
-                <th>ID</th>
-                <th>Mallette</th>
-                <th>Invisible</th>
-                <th>Brouillé</th>
-                <th>Tracker</th>
-                <th>Code Invisibilité</th>
-                <th>Code Brouillage</th>
-                <th>Npc</th>
-                <th>Last Update</th>
-            </tr></thead>
-            <tbody id="teamInfos">
-            </tbody>
-        </table>
-        </div>
-
-	    <input id="popup"/><button id="sendPopup">Send popup to all clients</button><br/>
-        <br/>
-        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=50px /></a><br/>
-        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
-    </div>
-
-	<script type="text/javascript">
-		//////////////////////////////////////////////////////////////////////////////
-		// SETUP MAP
-		setup_map();
-
-		map.on("dblclick", function(data){
-			socket.emit("newTracker", {"position": [data.latlng.lat, data.latlng.lng]});
-		});
-
-		//////////////////////////////////////////////////////////////////////////////
-		// UPDATE MAP
-
-    socket = io({rejectUnauthorized: false, auth: {type:"Admin"}});
-
-		setup_socket_common();
-
-		//////////////////////////////////////////////////////////////////////////////
-		// INTERACTION
-
-        var equipes = {};
-        var info_table = document.getElementById("teamInfos");
-
-        function sendUpdate(id){
-            var state = {};
-            state.mallette = document.getElementById(`${id}.mallette`).checked;
-            state.invisibility = document.getElementById(`${id}.invisibility`).checked;
-            state.blurred = document.getElementById(`${id}.blurred`).checked;
-            state.tracker = document.getElementById(`${id}.tracker`).checked;
-            state.npc = document.getElementById(`${id}.npc`).value;
-            socket.emit('setState', { id: id, state: state });
-        }
-
-        socket.on('update', function(data){
-            var id = data.id;
-            if(!(id in equipes)){
-                var row = `<td class="${data.vieux?"vieux":"conscrit"}">${id}</td>`;
-                row += `<td><input type="checkbox"
-                            id="${id}.mallette"
-                            onchange="sendUpdate('${id}')" /></td>`
-                row += `<td><input type="checkbox" 
-                            id="${id}.invisibility"
-                            onchange="sendUpdate('${id}')" /></td>`
-                row += `<td><input type="checkbox"
-                            id="${id}.blurred"
-                            onchange="sendUpdate('${id}')" /></td>`
-                row += `<td><input type="checkbox"
-                            id="${id}.tracker"
-                            onchange="sendUpdate('${id}')" /></td>`
-                row += `<td><span id="${id}.code.invisi"></span>
-                            <button onclick="socket.emit('newCode', {id:'${id}', code:'invisibility'})">
-                                Add
-                            </button>
-                        </td>`;
-                row += `<td><span id="${id}.code.blurred"></span>
-                            <button onclick="socket.emit('newCode', {id:'${id}', code:'blurred'})">
-                                Add
-                            </button>
-                        </td>`;
-                row += `<td><input type="number" min=0 max=9 style="width: 40px"
-                                        id="${id}.npc"
-                                        onchange="sendUpdate('${id}')" /></td>`
-                row += `<td><span id="${id}.time"></span></td>`
-                info_table.innerHTML += `<tr>${row}</tr>`
-                for(i in equipes){
-                    var equipe = equipes[i];
-                    document.getElementById(`${i}.mallette`).checked = equipe.state.mallette;
-                    document.getElementById(`${i}.invisibility`).checked = equipe.state.invisibility;
-                    document.getElementById(`${i}.blurred`).checked = equipe.state.blurred;
-                    document.getElementById(`${i}.tracker`).checked = equipe.state.tracker;
-                    document.getElementById(`${i}.npc`).value = equipe.state.npc;
-                }
-            }
-            equipes[id] = data;
-            document.getElementById(`${id}.mallette`).checked = data.state.mallette;
-            document.getElementById(`${id}.invisibility`).checked = data.state.invisibility;
-            document.getElementById(`${id}.blurred`).checked = data.state.blurred;
-            document.getElementById(`${id}.tracker`).checked = data.state.tracker;
-            document.getElementById(`${id}.code.invisi`).innerHTML = data.codes.invisibility;
-            document.getElementById(`${id}.code.blurred`).innerHTML = data.codes.blurred;
-            document.getElementById(`${id}.npc`).value = data.state.npc;
-            var now = new Date();
-            document.getElementById(`${id}.time`).innerHTML =
-                `${now.getHours()}:${now.getMinutes()}:${now.getSeconds()}`;
-        });
-
-		document.querySelector('#sendPopup').addEventListener('click', function(){
-			const input = document.querySelector('#popup');
-			socket.emit("popup", {"content": input.value});
-		});
-	</script>
-</body>
-</html>
diff --git a/templates/admin.html.hbs b/templates/admin.html.hbs
new file mode 100644
index 0000000..a2f1be2
--- /dev/null
+++ b/templates/admin.html.hbs
@@ -0,0 +1,221 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Traque | Client admin</title>
+
+  <!-- LEAFLET INCLUDE -->
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
+  integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
+  crossorigin=""/>
+  <script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
+  integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
+  crossorigin=""></script>
+
+  <style type="text/css">
+    #map {
+            position: fixed;
+            top: 0px;
+            left: 0px;
+            height: 100%;
+            width: 50%;
+        }
+    #right {
+        position: fixed;
+        width: 49%;
+        height: 98%;
+        top: 1%;
+        right: 0.5%;
+    }
+
+    .vieux { color: DarkOrchid; }
+    .code_count { width: 90%; }
+
+    .tableFixHead          { overflow: auto; height: 60%; }
+    .tableFixHead thead th { position: sticky; top: 0; z-index: 1; }
+    table  { border-collapse: collapse; width: 100%; }
+    th, td { padding: 8px 16px; }
+    th     { background: Grey; }
+    tr:nth-child(even) { background-color: Silver; }
+  </style>
+
+  <script type="text/javascript" src="utils.js"></script>
+</head>
+<body>
+  <div id="map"></div>
+
+    <div id="right">
+        <div class="tableFixHead">
+        <table>
+            <thead><tr>
+                <th>Nom</th>
+                <th>Mallette</th>
+                <th>Tracker</th>
+                <th>Invisible</th>
+                <th>Brouillé</th>
+                <th>Code Invisibilité</th>
+                <th>Code Brouillage</th>
+                <th>Couleur</th>
+                <!-- <th>Last Update</th> -->
+            </tr></thead>
+            <tbody id="teamInfos">
+            </tbody>
+        </table>
+        </div>
+
+      <input id="popup"/><button id="sendPopup">Send popup to all clients</button><br/>
+        <br/>
+        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=50px /></a><br/>
+        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
+    </div>
+
+  <script type="text/javascript">
+    setup_map();
+
+//  map.on("dblclick", function(data){
+//    socket.emit("newTracker", {"position": [data.latlng.lat, data.latlng.lng]});
+//  });
+
+    var equipes = {};
+    var equipes_markers = {};
+    var info_table = document.getElementById("teamInfos");
+
+    function show_update(id){
+      var equipe = equipes[id];
+      var state = equipe.state;
+      if("Vieux" in state){
+        state = state.Vieux;
+        document.getElementById(`${id}.invisibility`).checked = state.invisible;
+        document.getElementById(`${id}.color`).value = state.color;
+      } else {
+        state = state.Conscrit;
+        document.getElementById(`${id}.mallette`).checked = state.mallette;
+        document.getElementById(`${id}.invisibility`).checked = state.invisible;
+        document.getElementById(`${id}.blurred`).checked = state.blurred;
+        document.getElementById(`${id}.tracker`).checked = state.captured;
+        document.getElementById(`${id}.bonus.invisi`).value = state.invisibility_codes;
+        document.getElementById(`${id}.bonus.blurred`).value = state.blur_codes;
+      }
+      equipes_markers[id].setLatLng(equipe.pos);
+      equipes_markers[id].setIcon(icons[equipe.color]);
+    }
+
+    evtSource = new EventSource("/admin/events?tok={{tok}}");
+    function update(data) {
+      {{#if dbg}}console.log(data);{{/if}}
+      var id = data.id;
+      if(!(id in equipes)){
+        var row = "";
+        if("Vieux" in data.state){
+          row = `<td class="vieux">${data.name}</td>`;
+          row += `<td></td>`;
+          row += `<td></td>`;
+          row += `<td><input type="checkbox"
+                       id="${id}.invisibility"
+                       onchange="modifyVieux('${id}')" /></td>`;
+          row += `<td></td>`;
+          row += `<td></td>`;
+          row += `<td></td>`;
+          row += `<td><select id="${id}.color"
+                    onchange="modifyVieux('${id}')" >
+                    <option value=1>1- Tracker</option>
+                    <option value=3>3- <img src="/icons/3.png" height=15px></option>
+                    <option value=4>4- <img src="/icons/4.png" height=15px></option>
+                    <option value=5>5- <img src="/icons/5.png" height=15px></option>
+                    <option value=6>6- <img src="/icons/6.png" height=15px></option>
+                    <option value=7>7- <img src="/icons/7.png" height=15px></option>
+                    <option value=8>8- <img src="/icons/8.png" height=15px></option>
+                    <option value=9>9- <img src="/icons/9.png" height=15px></option>
+                    <option value=10>10- <img src="/icons/10.png" height=15px></option>
+                    <option value=11>11- <img src="/icons/11.png" height=15px></option>
+                  </select></td>`;
+        } else {
+          row = `<td class="conscrit">${data.name}</td>`;
+          row += `<td><input type="checkbox"
+                      id="${id}.mallette"
+                      onchange="modifyConscrit('${id}')" /></td>`
+          row += `<td><input type="checkbox"
+                      id="${id}.tracker"
+                      onchange="modifyConscrit('${id}')" /></td>`
+          row += `<td><input type="checkbox"
+                       id="${id}.invisibility"
+                       onchange="modifyConscrit('${id}')" /></td>`;
+          row += `<td><input type="checkbox"
+                      id="${id}.blurred"
+                      onchange="modifyConscrit('${id}')" /></td>`
+          row += `<td><input type="number" min="0"
+                      id="${id}.bonus.invisi"
+                      class="code_count"
+                      onchange="modifyConscrit('${id}')" />
+                  </td>`;
+          row += `<td><input type="number" min="0"
+                      id="${id}.bonus.blurred"
+                      class="code_count"
+                      onchange="modifyConscrit('${id}')" />
+                  </td>`;
+          row += `<td></td>`;
+        }
+        info_table.innerHTML += `<tr>${row}</tr>`
+        equipes[id] = data;
+        equipes_markers[id] = L.marker([0,0], {"icon": icons[0] }).addTo(map);
+        equipes_markers[id].bindPopup(data.name);
+        setTimeout(function (){
+          for(i in equipes){
+            show_update(i);
+          }
+        }, 10);
+      } else {
+        equipes[id] = data;
+        show_update(id);
+      }
+    };
+    evtSource.addEventListener("update", (event) => {
+      data = JSON.parse(event.data);
+      update(data);
+    });
+    evtSource.addEventListener("full_update", (event) => {
+      data = JSON.parse(event.data);
+      info_table.innerHTML = "";
+      equipes = {};
+      for(i in equipes_markers){
+        equipes_markers[i].remove();
+      }
+      equipes_markers = {};
+      for (tracked of data) {
+        update(tracked);
+      }
+    });
+
+    function modifyVieux(id){
+      state = {
+        Vieux: {
+          invisible: document.getElementById(`${id}.invisibility`).checked,
+          color: document.getElementById(`${id}.color`).value - 0,
+        }
+      };
+      fetch(`/admin/${id}?tok={{tok}}`, {
+        method: "PATCH",
+        body: JSON.stringify(state)
+      });
+    }
+
+    function modifyConscrit(id){
+      state = {
+        Conscrit: {
+          mallette: document.getElementById(`${id}.mallette`).checked,
+          invisible: document.getElementById(`${id}.invisibility`).checked,
+          blurred: document.getElementById(`${id}.blurred`).checked,
+          captured: document.getElementById(`${id}.tracker`).checked,
+          invisibility_codes: document.getElementById(`${id}.bonus.invisi`).value - 0,
+          blur_codes: document.getElementById(`${id}.bonus.blurred`).value - 0,
+        }
+      };
+      fetch(`/admin/${id}?tok={{tok}}`, {
+        method: "PATCH",
+        body: JSON.stringify(state)
+      });
+    }
+  </script>
+</body>
+</html>
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
index fe1e978..68fbe3c 100644
--- a/templates/conscrit.html.hbs
+++ b/templates/conscrit.html.hbs
@@ -41,6 +41,7 @@
     dbg = {{dbg}};
 
     setup_map();
+    setup_map_self();
 //  {{#if gpslog}}setup_geoLoc();{{/if}}
 
     //////////////////////////////////////////////////////////////////////////////
diff --git a/templates/vieux.html.hbs b/templates/vieux.html.hbs
index 9f92b9e..fbc89ac 100644
--- a/templates/vieux.html.hbs
+++ b/templates/vieux.html.hbs
@@ -67,6 +67,7 @@
     dbg = {{dbg}};
 
     setup_map();
+    setup_map_self();
 //  {{#if gpslog}}setup_geoLoc();{{/if}}
 
     //////////////////////////////////////////////////////////////////////////////
-- 
2.47.0


From 08dfa32088290ea337e8515ea0f68ccd865e6a88 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 12 Jun 2024 15:11:23 +0200
Subject: [PATCH 11/14] feat(bonus): rewrite

---
 src/main.rs                 | 136 ++++++++++++++++++++++++++++++++++--
 templates/conscrit.html.hbs |   8 +--
 2 files changed, 133 insertions(+), 11 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7a56a54..401be0d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,7 +7,7 @@ use rocket::{
     serde::{json::Json, Deserialize, Serialize},
     tokio::{
         self, select,
-        time::{self, Duration, Instant},
+        time::{self, sleep, Duration, Instant},
     },
     Shutdown, State,
 };
@@ -37,6 +37,8 @@ enum TrackedState {
 use TrackedState::{Conscrit, Vieux};
 
 const BLURRED_MOVE: (f32, f32) = (0.0005, 0.0005);
+const BONUS_TIMEOUT: Duration = Duration::from_millis(5000);
+const EVENT_TIMEOUT: Duration = Duration::from_millis(100);
 
 impl TrackedState {
     fn invisible(&self) -> bool {
@@ -142,7 +144,7 @@ struct QueuedEvent {
 
 impl QueuedEvent {
     fn expired(&self) -> bool {
-        self.date.elapsed() >= Duration::from_millis(100)
+        self.date.elapsed() >= EVENT_TIMEOUT
     }
 }
 impl From<Event> for QueuedEvent {
@@ -255,8 +257,8 @@ fn tracked_view(
     if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
         Some(Template::render(
             match tracked.read().unwrap().state {
-                TrackedState::Vieux { .. } => "vieux",
-                TrackedState::Conscrit { .. } => "conscrit",
+                Vieux { .. } => "vieux",
+                Conscrit { .. } => "conscrit",
             },
             context! {
                 name: &tracked.read().unwrap().name,
@@ -292,7 +294,7 @@ fn tracked_events<'a>(
 ) -> Option<EventStream![Event + 'a]> {
     if evt_queue.read().unwrap().contains_key(&id.to_string()) {
         Some(EventStream! {
-            let mut interval = time::interval(Duration::from_millis(100));
+            let mut interval = time::interval(EVENT_TIMEOUT);
             loop {
                 select!{
                     _ = interval.tick() =>{
@@ -364,7 +366,7 @@ fn admin_events<'a>(
             .collect();
         Some(EventStream! {
             yield Event::json(&full_info).event("full_update");
-            let mut interval = time::interval(Duration::from_millis(100));
+            let mut interval = time::interval(EVENT_TIMEOUT);
             loop {
                 select!{
                     _ = interval.tick() =>{
@@ -437,6 +439,124 @@ fn set_state(
     }
 }
 
+#[put("/track/<id>/vanish")]
+async fn activate_invisibility(
+    id: &str,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) -> Option<()> {
+    let tracking_lock = tracking.read().unwrap();
+    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
+    if let Conscrit {
+        ref mut invisible,
+        ref mut invisibility_codes,
+        ..
+    } = tracked.state
+    {
+        if *invisibility_codes > 0 {
+            *invisibility_codes -= 1;
+            *invisible = true;
+            state_update(&tracked, &evt_queues, &admin_queue);
+            let track_clone = (*tracking).clone();
+            let queue_clone = (*evt_queues).clone();
+            let admin_clone = (*admin_queue).clone();
+            let id_str = id.to_string();
+            tokio::spawn(async move {
+                sleep(BONUS_TIMEOUT).await;
+                if let Conscrit {
+                    ref mut invisible, ..
+                } = track_clone
+                    .read()
+                    .unwrap()
+                    .get(&id_str)
+                    .unwrap()
+                    .write()
+                    .unwrap()
+                    .state
+                {
+                    *invisible = false;
+                }
+                state_update(
+                    &track_clone
+                        .read()
+                        .unwrap()
+                        .get(&id_str)
+                        .unwrap()
+                        .read()
+                        .unwrap(),
+                    &queue_clone,
+                    &admin_clone,
+                );
+            });
+            Some(())
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+#[put("/track/<id>/blur")]
+async fn activate_blur(
+    id: &str,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) -> Option<()> {
+    let tracking_lock = tracking.read().unwrap();
+    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
+    if let Conscrit {
+        ref mut blurred,
+        ref mut blur_codes,
+        ..
+    } = tracked.state
+    {
+        if *blur_codes > 0 {
+            *blur_codes -= 1;
+            *blurred = true;
+            state_update(&tracked, &evt_queues, &admin_queue);
+            let track_clone = (*tracking).clone();
+            let queue_clone = (*evt_queues).clone();
+            let admin_clone = (*admin_queue).clone();
+            let id_str = id.to_string();
+            tokio::spawn(async move {
+                sleep(BONUS_TIMEOUT).await;
+                if let Conscrit {
+                    ref mut blurred, ..
+                } = track_clone
+                    .read()
+                    .unwrap()
+                    .get(&id_str)
+                    .unwrap()
+                    .write()
+                    .unwrap()
+                    .state
+                {
+                    *blurred = false;
+                }
+                state_update(
+                    &track_clone
+                        .read()
+                        .unwrap()
+                        .get(&id_str)
+                        .unwrap()
+                        .read()
+                        .unwrap(),
+                    &queue_clone,
+                    &admin_clone,
+                );
+            });
+            Some(())
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
 #[get("/")]
 fn index() -> &'static str {
     "Hello, world!"
@@ -529,11 +649,13 @@ async fn rocket() -> _ {
                 admin_page,
                 admin_events,
                 admin_set_state,
+                activate_invisibility,
+                activate_blur,
             ],
         )
         .mount("/", FileServer::from(relative!("static")));
     tokio::spawn(async move {
-        let mut clean_interval = time::interval(Duration::from_millis(500));
+        let mut clean_interval = time::interval(5 * EVENT_TIMEOUT);
         let mut coord_interval = time::interval(Duration::from_millis(3000));
         loop {
             select! {
diff --git a/templates/conscrit.html.hbs b/templates/conscrit.html.hbs
index 68fbe3c..2638405 100644
--- a/templates/conscrit.html.hbs
+++ b/templates/conscrit.html.hbs
@@ -49,12 +49,12 @@
 
     function self_state_hook(state){
         var code_buttons = "";
-        if(state.Conscrit.invisibility_codes > 0)//onclick="socket.emit('useCode', 'invisibility')"
-            code_buttons += `<button>
+        if(state.Conscrit.invisibility_codes > 0)
+            code_buttons += `<button onclick="fetch('/track/{{id}}/vanish', { method: 'PUT' })">
                                 Invisibilité
                             </button>`;
-        if(state.Conscrit.blur_codes > 0)//onclick="socket.emit('useCode', 'blurred')"
-            code_buttons += `<button>
+        if(state.Conscrit.blur_codes > 0)
+            code_buttons += `<button onclick="fetch('/track/{{id}}/blur', { method: 'PUT' })">
                                 Brouillage
                             </button>`;
         document.getElementById(`codes`).innerHTML = code_buttons;
-- 
2.47.0


From 4439f6b4dbd47cacfe1f2181d9e7f19eaa32a773 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 12 Jun 2024 15:14:23 +0200
Subject: [PATCH 12/14] remove js code base

---
 .gitignore       |   3 -
 package.json     |   8 -
 sample_config.js |  23 ---
 traque.js        | 392 -----------------------------------------------
 4 files changed, 426 deletions(-)
 delete mode 100644 package.json
 delete mode 100644 sample_config.js
 delete mode 100644 traque.js

diff --git a/.gitignore b/.gitignore
index 80bc381..3ea2906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-node_modules
-package-lock.json
-config.js
 .envrc
 .direnv
 
diff --git a/package.json b/package.json
deleted file mode 100644
index 0d668e7..0000000
--- a/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "traque",
-  "version": "0.0.1",
-  "description": "appli pour la traque",
-  "dependencies": {
-    "socket.io": "^4.5.2"
-  }
-}
diff --git a/sample_config.js b/sample_config.js
deleted file mode 100644
index 05a20e7..0000000
--- a/sample_config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Configuration file for the server
-
-conscrits = ["team00", "team01"];
-vieux = ["npc0", "npc1"];
-
-// return 0 for conscrit, 1 for vieux, 2 otherwise
-function validator(id){
-    if(conscrits.includes(id)) return 0;
-    if(vieux.includes(id)) return 1;
-    return 2;
-}
-
-module.exports = {
-	"port": 9000,
-	"http_port": 9001,
-	"key": "certif/server.key",
-	"cert": "certif/server.crt",
-  "validator": validator,
-
-  // Offset for the randomization of the blurred status
-  "lat_ofs":  0.0005,
-  "long_ofs": 0.0005,
-}
diff --git a/traque.js b/traque.js
deleted file mode 100644
index 3ed1320..0000000
--- a/traque.js
+++ /dev/null
@@ -1,392 +0,0 @@
-/* struct equipe
-{
-    "id" : string,
-    "pos" : [lat : float, long : float],
-    "vieux": bool,
-    "state" : {
-        "invisibilty" : bool,
-        "blurred": bool,
-        "tracker" : bool,
-        "npc" : int,
-        "mallette": bool
-    },
-    "codes" : {
-        "invisiblity" : int,
-        "blurred" : int
-    }
-}
-
-Les messages à transmettre par le client :
-- position, HTTP "/log?id=%ID&lat=%LAT&lon=%LON"
-- use(code)
-- (vieux) changeState (state)
-Les messages à transmettre par le serveur :
-- moving(id, color, position)
-- setCodes(codes)
-- (vieux) newState(state)
-*/
-
-// require = include
-var https = require('https');
-var http = require('http');
-var url = require('url');
-var fs = require('fs');
-var config = require('./config.js');
-
-// Textes d'interaction avec les conscrits
-const MSG_BAD = "Code Incorrect";
-const MSG_TRACKED = "Vous êtes maintenant traqué.e.s !"
-const MSG_TRACKER = "Vous pouvez maintenant traquer !";
-const MSG_CODES = {
-    blurred: "Votre positions est maintenant brouillée !",
-    invisibility: "Les autres équipes ne peuvent plus vous voir !"
-};
-const bonus_delay = 10000;// 3*60*1000;
-
-var equipes = {};
-
-console.log("Setup https server");
-
-const option = {
-  key: fs.readFileSync(config.key),
-  cert: fs.readFileSync(config.cert)
-};
-
-function replaceAll_legacy(data, pattern, replacement){
-  var replacing = data.replace(pattern, replacement);
-  while(replacing != data){
-    data = replacing;
-    replacing = data.replace(pattern, replacement);
-  }
-  return data;
-}
-
-// The server
-var server = https.createServer(option, function(req, res){
-    var q = url.parse(req.url, true);
-    var filename = "static" + q.pathname;
-    if(q.pathname.includes(".."))
-        filename = "static/dotdot.html";
-
-    if(q.pathname.startsWith("/tracking/")){
-        id = q.pathname.substring("/tracking/".length);
-        gpslog = true;
-        if(id.startsWith("nolog/")){
-            gpslog = false;
-            id = id.substring("nolog/".length);
-        }
-        var end_path = ["conscrit.html", "vieux.html", "invalid.html"][config.validator(id)];
-        filename = "static/tracking/" + end_path;
-        return fs.readFile(filename, 'utf8', function(err, data){
-            if(err)
-                throw new Error("where " + end_path + " is !?");
-
-            res.writeHead(200, {'Content-Type': 'text/html'});
-            res.write(replaceAll_legacy(replaceAll_legacy(data, "%GPSLOG", gpslog), "%ID", id));
-            return res.end();
-        });
-    }
-
-    if(q.pathname == "/log"){
-        //position logging
-        console.log("team " + q.query.id + " moved to (" + q.query.lat + "," + q.query.lon + ")");
-
-        var id = q.query.id;
-        if(id in equipes){
-            equipes[id].pos = [q.query.lat, q.query.lon];
-            emit_update(id);
-        }
-
-        //return empty page
-        res.writeHead(200, {'Content-Type': 'text/html'});
-        return res.end();
-    }
-    fs.readFile(filename, function(err, data) {
-    if (err) {
-        console.log("404: ", q.pathname, filename);
-        res.writeHead(404, {'Content-Type': 'text/html'});
-        return res.end("404 Not Found");
-    }
-    if(filename.endsWith('.js'))
-        res.writeHead(200, {'Content-Type': 'text/javascript'});
-    else if(filename.endsWith('.png'))
-        res.writeHead(200, {'Content-Type': 'image/png'});
-    else if(filename.endsWith('.ico'))
-        res.writeHead(200, {'Content-Type': 'image/ico'});
-    else
-        res.writeHead(200, {'Content-Type': 'text/html'});
-    res.write(data);
-    return res.end();
-    });
-});
-
-console.log("Setup http redirection");
-//HTTP -> HTTPS redirect
-var redirect_server = http.createServer(function(req, res){
-  var url = `https://${req.headers.host.split(":")[0]}:${config.port}${req.url}`;
-  res.writeHead(301,{Location: url});
-  res.end();
-});
-
-console.log("Setup io server");
-const { Server } = require("socket.io");
-var io = new Server(server);
-
-io.use(function(socket, next){
-    var id = socket.handshake.auth.id;
-    var type = socket.handshake.auth.type;
-
-    if(type == "Admin")
-        next();
-    else{
-        var valid = config.validator(id);
-        if(valid == 0 && type == "conscrit" ||
-           valid == 1 && type == "vieux"){
-            if(!(id in equipes)){
-                equipes[id] = default_team(id, valid);
-                emit_update(id);
-            }
-            next();
-        } else
-            next(new Error("invalid"));
-    }
-});
-
-async function join_leave(team_id, join, leave){
-    var sockets = await io.in(team_id).fetchSockets();
-    for(s of sockets){
-        for(r of join)
-            s.join(r);
-        for(r of leave)
-            s.leave(r);
-    }
-}
-
-/////////////////
-// Tracking room
-//
-// Everyone in this room is located
-// sub-rooms :
-// * "npc" room for non-player
-// * "Tracker" room for trackers
-// * "mallette" room for player with a mallette
-// * "%ID" room of a team
-//
-// To join :
-//   auth = {
-//      type = "conscrit" | "vieux",
-//      id = "%ID"
-//   }
-// "conscrit" are classical player, "vieux" are npcs (they can become tracker when needed)
-var tracking = io.to("Tracking");
-var tracker = io.to("Tracker");
-var mallette = io.to("mallette");
-
-/////////////////
-// Admin room
-//
-// Room for admins
-// To join :
-//   auth = {
-//      type = "Admin"
-//   }
-var admin = io.to("Admin");
-
-// visible color of a team
-function color(team){
-    if(team.state.tracker) return 1;
-    if(team.state.npc != 0) return team.state.npc - 0 + 2;
-    return 0;
-}
-
-function admin_color(team){
-    if(team.state.invisibility) return 2;
-    if(team.state.tracker) return 1;
-    if(team.state.npc != 0) return team.state.npc - 0 + 2;
-    return 0;
-}
-
-// apparent information of a team, for tracker only
-function apparent_info_tracker(equipe){
-    if(equipe.state.invisibility)
-        return {"id": equipe.id, "color": color(equipe), "position": [0,0]};
-    if(equipe.state.blurred)
-        return {"id": equipe.id, "color": color(equipe),
-                "position": [parseFloat(equipe.pos[0])+config.lat_ofs*(Math.random()*2-1),
-                            parseFloat(equipe.pos[1])+config.long_ofs*(Math.random()*2-1)]};
-    return {"id": equipe.id, "color": color(equipe), "position": equipe.pos};
-}
-
-// apparent information of a team, for mallette only
-function apparent_info_mallette(equipe){
-    if(equipe.state.npc == 0 && !equipe.state.tracker)
-        return {"id": equipe.id, "color": color(equipe), "position": equipe.pos};
-    return apparent_info_agent(equipe);
-}
-
-// apparent information of a team, for agent only
-function apparent_info_agent(equipe){
-    if(equipe.state.mallette)
-        return {"id": equipe.id, "color": color(equipe), "position": equipe.pos};
-    if(equipe.state.npc == 0 && !equipe.state.tracker)
-        return {"id": equipe.id, "color": color(equipe), "position": [0,0]};
-    return apparent_info_tracker(equipe);
-}
-
-function emit_update(team_id) {
-    var equipe = equipes[team_id];
-    tracker.except(team_id).emit('moving', apparent_info_tracker(equipe));
-    mallette.except(team_id).emit('moving', apparent_info_mallette(equipe));
-    tracking.except("Tracker").except("mallette").except(team_id).emit('moving', apparent_info_agent(equipe));
-
-    // the team, the npcs and the admins always have the real informations
-    admin.to("npc").to(team_id)
-      .emit('moving', {"id": team_id, "color": admin_color(equipe), "position": equipe.pos});
-    admin.emit('update', equipe);
-}
-
-// produces a team object populated with default values
-function default_team(team_id, valid) {
-    var state = {};
-    state.invisibility = valid != 0;
-    state.blurred = false;
-    state.tracker = false;
-    state.npc = valid;
-    state.mallette = false;
-
-    var codes = {};
-    codes.blurred = 0;
-    codes.invisibility = 0;
-
-    var equipe = {};
-    equipe.state = state;
-    equipe.codes = codes;
-    equipe.vieux = valid == 1;
-    equipe.pos = [0,0];
-    equipe.id = team_id;
-    return equipe;
-}
-
-function send_update(team){
-  io.to(team.id).emit('moving', {"id": team.id, "color": color(team), "position": team.pos});
-  for(other_id in equipes)
-    if(other_id != team.id){
-      if(team.state.tracker)
-        io.to(team.id).emit('moving', apparent_info_tracker(equipes[other_id]));
-      else if(team.state.mallette)
-        io.to(team.id).emit('moving', apparent_info_mallette(equipes[other_id]));
-      else if(team.state.npc != 0)
-        io.to(team.id).emit('moving', {"id": other_id, "color": admin_color(equipes[other_id]), "position": equipes[other_id].pos});
-      else
-        io.to(team.id).emit('moving', apparent_info_agent(equipes[other_id]));
-    }
-}
-
-// connect a socket to the room corresponding to its team and send it infos
-function team_join(team, socket){
-    socket.join(team.id);
-    socket.emit('moving', {"id": team.id, "color": color(team), "position": team.pos});
-    for(other_id in equipes)
-        if(other_id != team.id){
-            if(team.state.tracker)
-                socket.emit('moving', apparent_info_tracker(equipes[other_id]));
-            else if(team.state.mallette)
-                socket.emit('moving', apparent_info_mallette(equipes[other_id]));
-            else if(team.state.npc != 0)
-                socket.emit('moving', {"id": other_id, "color": admin_color(equipes[other_id]), "position": equipes[other_id].pos});
-            else
-                socket.emit('moving', apparent_info_agent(equipes[other_id]));
-        }
-}
-
-console.log("Setup handlers");
-io.on('connection', function(socket){
-    if(socket.handshake.auth.type == "conscrit") {
-        var id = socket.handshake.auth.id;
-        var equipe = equipes[id]
-        socket.join("Tracking");
-        if(equipe.state.tracker)
-            socket.join("Tracker");
-        if(equipe.state.mallette)
-            socket.join("mallette");
-        team_join(equipe, socket);
-
-        socket.on("useCode", function(code){
-            if(code in equipe.codes && equipe.codes[code] > 0){
-                equipe.codes[code] -= 1;
-                equipe.state[code] = true;
-                io.to(id).emit('popup', {content: MSG_CODES[code]});
-                io.to(id).emit('setCodes', equipe.codes);
-                emit_update(id);
-                setTimeout(function(eq, c){
-                    eq.state[c] = false;
-                    emit_update(eq.id);
-                }, bonus_delay, equipe, code);
-            }
-        });
-    }
-
-    if(socket.handshake.auth.type == "vieux"){
-        var id = socket.handshake.auth.id;
-        var equipe = equipes[id]
-        socket.join("npc");
-        team_join(equipe, socket);
-
-        socket.on('changeState', function(d){
-            equipe.state = d;
-            io.to(id).emit('newState', d);
-            emit_update(id);
-        });
-
-        socket.emit('newState', equipe.state);
-    }
-
-    if(socket.handshake.auth.type == "Admin"){
-        socket.join("Admin");
-
-        socket.on('newCode', function(d){
-            equipes[d.id].codes[d.code] += 1;
-            io.to(d.id).emit('setCodes', equipes[d.id].codes);
-            admin.emit('update', equipes[d.id]);
-        });
-
-        socket.on('popup', function(d){
-            tracking.emit('popup', {"content": d.content});
-        });
-
-        socket.on('newTracker', function(d){
-            io.emit('newTracker', d);
-        });
-
-        socket.on('setState', function(d){
-            equipes[d.id].state = d.state;
-            var join = [];
-            var leave = [];
-            if(d.state.tracker)
-                join.push("Tracker");
-            else
-                leave.push("Tracker");
-            if(d.state.mallette){
-                join.push("mallette");
-            } else{
-                leave.push("mallette");
-            }
-            join_leave(d.id, join, leave);
-            send_update(equipes[d.id]);
-            emit_update(d.id);
-            if(equipes[d.id].vieux)
-                io.to(d.id).emit('newState', d.state);
-        });
-
-        for(i in equipes){
-            var equipe = equipes[i];
-            socket.emit('moving', {"id": equipe.id, "color": color(equipe), "position": equipe.pos});
-            socket.emit('update', equipe);
-        }
-    }
-});
-
-console.log("Launch server");
-server.listen(config.port, "::");
-redirect_server.listen(config.http_port, "::");
-console.log("Running !");
-- 
2.47.0


From c4426de586125813dff44bcf0d0104b64453d762 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 12 Jun 2024 16:41:24 +0200
Subject: [PATCH 13/14] module separation

---
 src/admin.rs  |  88 ++++++++
 src/global.rs | 269 ++++++++++++++++++++++++
 src/main.rs   | 570 +-------------------------------------------------
 src/track.rs  | 235 +++++++++++++++++++++
 4 files changed, 602 insertions(+), 560 deletions(-)
 create mode 100644 src/admin.rs
 create mode 100644 src/global.rs
 create mode 100644 src/track.rs

diff --git a/src/admin.rs b/src/admin.rs
new file mode 100644
index 0000000..1cf53d3
--- /dev/null
+++ b/src/admin.rs
@@ -0,0 +1,88 @@
+use rocket::{
+    response::stream::{Event, EventStream},
+    serde::json::Json,
+    tokio::{
+        select,
+        time::{self},
+    },
+    Route, Shutdown, State,
+};
+use rocket_dyn_templates::{context, Template};
+
+use crate::global::*;
+
+#[get("/?<tok>&<dbg>")]
+fn admin_page(
+    tok: Option<AdminKey>,
+    dbg: Option<bool>,
+    admin_key: &State<AdminKey>,
+) -> Option<Template> {
+    if tok == Some(admin_key.to_string()) {
+        Some(Template::render(
+            "admin",
+            context! { tok: tok.unwrap(), dbg: dbg.unwrap_or(false) },
+        ))
+    } else {
+        None
+    }
+}
+
+#[patch("/<id>?<tok>", data = "<nstate>")]
+fn admin_set_state(
+    tok: Option<AdminKey>,
+    id: &str,
+    admin_key: &State<AdminKey>,
+    nstate: Json<TrackedState>,
+    tracking: &State<Tracking>,
+    evt_queue: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) -> Option<()> {
+    if tok == Some(admin_key.to_string()) {
+        let tracking_lock = tracking.read().unwrap();
+        let tracked = tracking_lock.get(&id.to_string()).unwrap();
+        tracked.write().unwrap().state = nstate.into_inner();
+        state_update(&tracked.read().unwrap(), &evt_queue, &admin_queue);
+        Some(())
+    } else {
+        None
+    }
+}
+
+#[get("/events?<tok>")]
+fn admin_events<'a>(
+    tok: Option<AdminKey>,
+    admin_key: &State<AdminKey>,
+    admin_queue: &'a State<AdminEventQueue>,
+    tracking: &State<Tracking>,
+    mut shutdown: Shutdown,
+) -> Option<EventStream![Event + 'a]> {
+    if tok == Some(admin_key.to_string()) {
+        let full_info: Vec<AdminTrackedInfo> = tracking
+            .read()
+            .unwrap()
+            .iter()
+            .map(|(_, tracked)| admin_view(&tracked.read().unwrap()))
+            .collect();
+        Some(EventStream! {
+            yield Event::json(&full_info).event("full_update");
+            let mut interval = time::interval(EVENT_TIMEOUT);
+            loop {
+                select!{
+                    _ = interval.tick() =>{
+                        for evt in evts_to_send(admin_queue){
+                            //println!("{:?}", evt);
+                            yield evt;
+                        }
+                    },
+                    _ = &mut shutdown => break
+                }
+            }
+        })
+    } else {
+        None
+    }
+}
+
+pub fn routes() -> Vec<Route> {
+    routes![admin_page, admin_set_state, admin_events]
+}
diff --git a/src/global.rs b/src/global.rs
new file mode 100644
index 0000000..aca80be
--- /dev/null
+++ b/src/global.rs
@@ -0,0 +1,269 @@
+use rand::Rng;
+use rocket::{
+    response::stream::Event,
+    serde::{Deserialize, Serialize},
+    tokio::time::{Duration, Instant},
+};
+use std::{
+    collections::{HashMap, VecDeque},
+    sync::{Arc, RwLock},
+};
+
+pub const BLURRED_MOVE: (f32, f32) = (0.0005, 0.0005);
+pub const BONUS_TIMEOUT: Duration = Duration::from_millis(5000);
+pub const EVENT_TIMEOUT: Duration = Duration::from_millis(100);
+
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(crate = "rocket::serde")]
+pub enum TrackedState {
+    Conscrit {
+        invisible: bool,
+        blurred: bool,
+        captured: bool,
+        mallette: bool,
+        invisibility_codes: u32,
+        blur_codes: u32,
+    },
+    Vieux {
+        color: u8,
+        invisible: bool,
+    },
+}
+
+use TrackedState::{Conscrit, Vieux};
+
+impl TrackedState {
+    pub fn invisible(&self) -> bool {
+        match self {
+            Conscrit { invisible, .. } => *invisible,
+            Vieux { invisible, .. } => *invisible,
+        }
+    }
+    pub fn blurred(&self) -> bool {
+        match self {
+            Conscrit { blurred, .. } => *blurred,
+            Vieux { .. } => false,
+        }
+    }
+    pub fn global_viewed(&self) -> bool {
+        match self {
+            Conscrit {
+                captured,
+                mallette,
+                invisible,
+                ..
+            } => (*captured || *mallette) && !*invisible,
+            Vieux { invisible, .. } => !*invisible,
+        }
+    }
+    pub fn color(&self) -> u8 {
+        match self {
+            Vieux { color, .. } => *color,
+            Conscrit { captured, .. } => {
+                if *captured {
+                    1
+                } else {
+                    0
+                }
+            }
+        }
+    }
+    pub fn admin_color(&self) -> u8 {
+        match self {
+            Vieux { color, invisible } => {
+                if *invisible {
+                    2
+                } else {
+                    *color
+                }
+            }
+            Conscrit {
+                invisible,
+                captured,
+                ..
+            } => {
+                if *invisible {
+                    2
+                } else if *captured {
+                    1
+                } else {
+                    0
+                }
+            }
+        }
+    }
+}
+
+pub struct Tracked {
+    pub id: String,
+    pub name: String,
+    pub pos: (f32, f32),
+    pub state: TrackedState,
+}
+
+pub fn build_conscrit(id: String, name: String) -> Tracked {
+    Tracked {
+        id: id,
+        name: name,
+        pos: (0.0, 0.0),
+        state: TrackedState::Conscrit {
+            invisible: false,
+            blurred: false,
+            captured: false,
+            mallette: false,
+            invisibility_codes: 0,
+            blur_codes: 0,
+        },
+    }
+}
+
+pub fn build_vieux(id: String, name: String) -> Tracked {
+    Tracked {
+        id: id,
+        name: name,
+        pos: (0.0, 0.0),
+        state: TrackedState::Vieux {
+            invisible: true,
+            color: 1,
+        },
+    }
+}
+
+pub struct QueuedEvent {
+    pub date: Instant,
+    pub evt: Event,
+}
+
+impl QueuedEvent {
+    pub fn expired(&self) -> bool {
+        self.date.elapsed() >= EVENT_TIMEOUT
+    }
+}
+impl From<Event> for QueuedEvent {
+    fn from(evt: Event) -> QueuedEvent {
+        QueuedEvent {
+            date: Instant::now(),
+            evt,
+        }
+    }
+}
+impl From<QueuedEvent> for Event {
+    fn from(queued_evt: QueuedEvent) -> Event {
+        queued_evt.evt
+    }
+}
+
+pub type Tracking = Arc<RwLock<HashMap<String, RwLock<Tracked>>>>;
+pub type TrackingEventQueue = Arc<RwLock<HashMap<String, RwLock<VecDeque<QueuedEvent>>>>>;
+pub type AdminEventQueue = Arc<RwLock<VecDeque<QueuedEvent>>>;
+pub type AdminKey = String;
+
+#[derive(Serialize)]
+#[serde(crate = "rocket::serde")]
+pub struct TrackedInfo {
+    pub name: String,
+    pub pos: (f32, f32),
+    pub color: u8,
+}
+
+#[derive(Serialize)]
+#[serde(crate = "rocket::serde")]
+pub struct AdminTrackedInfo {
+    pub name: String,
+    pub id: String,
+    pub pos: (f32, f32),
+    pub color: u8,
+    pub state: TrackedState,
+}
+
+impl From<AdminTrackedInfo> for TrackedInfo {
+    fn from(admin_info: AdminTrackedInfo) -> TrackedInfo {
+        TrackedInfo {
+            name: admin_info.name,
+            pos: admin_info.pos,
+            color: admin_info.color,
+        }
+    }
+}
+
+pub fn base_view(team: &Tracked) -> TrackedInfo {
+    TrackedInfo {
+        name: team.name.clone(),
+        pos: team.pos,
+        color: team.state.color(),
+    }
+}
+
+pub fn admin_view(team: &Tracked) -> AdminTrackedInfo {
+    AdminTrackedInfo {
+        name: team.name.clone(),
+        id: team.id.clone(),
+        pos: team.pos,
+        color: team.state.admin_color(),
+        state: team.state.clone(),
+    }
+}
+
+pub fn apparent_info(watcher: &Tracked, team: &Tracked) -> Option<TrackedInfo> {
+    if watcher.id == team.id {
+        None
+    } else if let Conscrit {
+        captured, mallette, ..
+    } = watcher.state
+    {
+        if captured {
+            if team.state.invisible() {
+                None
+            } else if team.state.blurred() {
+                let mut rng = rand::thread_rng();
+                let (lat, lon) = team.pos;
+                Some(TrackedInfo {
+                    pos: (
+                        lat + BLURRED_MOVE.0 * (rng.gen::<f32>() * 2.0 - 1.0),
+                        lon + BLURRED_MOVE.1 * (rng.gen::<f32>() * 2.0 - 1.0),
+                    ),
+                    ..base_view(team)
+                })
+            } else {
+                Some(base_view(team))
+            }
+        } else {
+            if mallette || team.state.global_viewed() {
+                Some(base_view(team))
+            } else {
+                None
+            }
+        }
+    } else {
+        Some(admin_view(team).into())
+    }
+}
+
+pub fn evts_to_send(evt_queue: &RwLock<VecDeque<QueuedEvent>>) -> Vec<Event> {
+    evt_queue
+        .read()
+        .unwrap()
+        .iter()
+        .filter(|qevt| !qevt.expired())
+        .map(|qevt| qevt.evt.clone())
+        .collect()
+}
+
+pub fn state_update(
+    tracked: &Tracked,
+    evt_queues: &TrackingEventQueue,
+    admin_queue: &AdminEventQueue,
+) {
+    evt_queues
+        .read()
+        .unwrap()
+        .get(&tracked.id)
+        .unwrap()
+        .write()
+        .unwrap()
+        .push_back(Event::json(&admin_view(tracked)).event("self_info").into());
+    admin_queue
+        .write()
+        .unwrap()
+        .push_back(Event::json(&admin_view(tracked)).event("update").into());
+}
diff --git a/src/main.rs b/src/main.rs
index 401be0d..64d1ea1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,561 +1,23 @@
 #[macro_use]
 extern crate rocket;
-use rand::Rng;
 use rocket::{
     fs::{relative, FileServer},
-    response::stream::{Event, EventStream},
-    serde::{json::Json, Deserialize, Serialize},
+    response::stream::Event,
     tokio::{
         self, select,
-        time::{self, sleep, Duration, Instant},
+        time::{self, Duration},
     },
-    Shutdown, State,
 };
-use rocket_dyn_templates::{context, Template};
+use rocket_dyn_templates::Template;
 use std::{
     collections::{HashMap, VecDeque},
     sync::{Arc, RwLock},
 };
 
-#[derive(Serialize, Deserialize, Clone)]
-#[serde(crate = "rocket::serde")]
-enum TrackedState {
-    Conscrit {
-        invisible: bool,
-        blurred: bool,
-        captured: bool,
-        mallette: bool,
-        invisibility_codes: u32,
-        blur_codes: u32,
-    },
-    Vieux {
-        color: u8,
-        invisible: bool,
-    },
-}
-
-use TrackedState::{Conscrit, Vieux};
-
-const BLURRED_MOVE: (f32, f32) = (0.0005, 0.0005);
-const BONUS_TIMEOUT: Duration = Duration::from_millis(5000);
-const EVENT_TIMEOUT: Duration = Duration::from_millis(100);
-
-impl TrackedState {
-    fn invisible(&self) -> bool {
-        match self {
-            Conscrit { invisible, .. } => *invisible,
-            Vieux { invisible, .. } => *invisible,
-        }
-    }
-    fn blurred(&self) -> bool {
-        match self {
-            Conscrit { blurred, .. } => *blurred,
-            Vieux { .. } => false,
-        }
-    }
-    fn global_viewed(&self) -> bool {
-        match self {
-            Conscrit {
-                captured,
-                mallette,
-                invisible,
-                ..
-            } => (*captured || *mallette) && !*invisible,
-            Vieux { invisible, .. } => !*invisible,
-        }
-    }
-    fn color(&self) -> u8 {
-        match self {
-            Vieux { color, .. } => *color,
-            Conscrit { captured, .. } => {
-                if *captured {
-                    1
-                } else {
-                    0
-                }
-            }
-        }
-    }
-    fn admin_color(&self) -> u8 {
-        match self {
-            Vieux { color, invisible } => {
-                if *invisible {
-                    2
-                } else {
-                    *color
-                }
-            }
-            Conscrit {
-                invisible,
-                captured,
-                ..
-            } => {
-                if *invisible {
-                    2
-                } else if *captured {
-                    1
-                } else {
-                    0
-                }
-            }
-        }
-    }
-}
-
-struct Tracked {
-    id: String,
-    name: String,
-    pos: (f32, f32),
-    state: TrackedState,
-}
-
-fn build_conscrit(id: String, name: String) -> Tracked {
-    Tracked {
-        id: id,
-        name: name,
-        pos: (0.0, 0.0),
-        state: TrackedState::Conscrit {
-            invisible: false,
-            blurred: false,
-            captured: false,
-            mallette: false,
-            invisibility_codes: 0,
-            blur_codes: 0,
-        },
-    }
-}
-
-fn build_vieux(id: String, name: String) -> Tracked {
-    Tracked {
-        id: id,
-        name: name,
-        pos: (0.0, 0.0),
-        state: TrackedState::Vieux {
-            invisible: true,
-            color: 1,
-        },
-    }
-}
-
-struct QueuedEvent {
-    date: Instant,
-    evt: Event,
-}
-
-impl QueuedEvent {
-    fn expired(&self) -> bool {
-        self.date.elapsed() >= EVENT_TIMEOUT
-    }
-}
-impl From<Event> for QueuedEvent {
-    fn from(evt: Event) -> QueuedEvent {
-        QueuedEvent {
-            date: Instant::now(),
-            evt,
-        }
-    }
-}
-impl From<QueuedEvent> for Event {
-    fn from(queued_evt: QueuedEvent) -> Event {
-        queued_evt.evt
-    }
-}
-
-type Tracking = Arc<RwLock<HashMap<String, RwLock<Tracked>>>>;
-type TrackingEventQueue = Arc<RwLock<HashMap<String, RwLock<VecDeque<QueuedEvent>>>>>;
-type AdminEventQueue = Arc<RwLock<VecDeque<QueuedEvent>>>;
-type AdminKey = String;
-
-#[derive(Serialize)]
-#[serde(crate = "rocket::serde")]
-struct TrackedInfo {
-    name: String,
-    pos: (f32, f32),
-    color: u8,
-}
-
-#[derive(Serialize)]
-#[serde(crate = "rocket::serde")]
-struct AdminTrackedInfo {
-    name: String,
-    id: String,
-    pos: (f32, f32),
-    color: u8,
-    state: TrackedState,
-}
-
-impl From<AdminTrackedInfo> for TrackedInfo {
-    fn from(admin_info: AdminTrackedInfo) -> TrackedInfo {
-        TrackedInfo {
-            name: admin_info.name,
-            pos: admin_info.pos,
-            color: admin_info.color,
-        }
-    }
-}
-
-fn base_view(team: &Tracked) -> TrackedInfo {
-    TrackedInfo {
-        name: team.name.clone(),
-        pos: team.pos,
-        color: team.state.color(),
-    }
-}
-
-fn admin_view(team: &Tracked) -> AdminTrackedInfo {
-    AdminTrackedInfo {
-        name: team.name.clone(),
-        id: team.id.clone(),
-        pos: team.pos,
-        color: team.state.admin_color(),
-        state: team.state.clone(),
-    }
-}
-
-fn apparent_info(watcher: &Tracked, team: &Tracked) -> Option<TrackedInfo> {
-    if watcher.id == team.id {
-        None
-    } else if let Conscrit {
-        captured, mallette, ..
-    } = watcher.state
-    {
-        if captured {
-            if team.state.invisible() {
-                None
-            } else if team.state.blurred() {
-                let mut rng = rand::thread_rng();
-                let (lat, lon) = team.pos;
-                Some(TrackedInfo {
-                    pos: (
-                        lat + BLURRED_MOVE.0 * (rng.gen::<f32>() * 2.0 - 1.0),
-                        lon + BLURRED_MOVE.1 * (rng.gen::<f32>() * 2.0 - 1.0),
-                    ),
-                    ..base_view(team)
-                })
-            } else {
-                Some(base_view(team))
-            }
-        } else {
-            if mallette || team.state.global_viewed() {
-                Some(base_view(team))
-            } else {
-                None
-            }
-        }
-    } else {
-        Some(admin_view(team).into())
-    }
-}
-
-#[get("/track/<id>?<gpslog>&<dbg>")]
-fn tracked_view(
-    id: &str,
-    gpslog: Option<bool>,
-    dbg: Option<bool>,
-    tracking: &State<Tracking>,
-) -> Option<Template> {
-    if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
-        Some(Template::render(
-            match tracked.read().unwrap().state {
-                Vieux { .. } => "vieux",
-                Conscrit { .. } => "conscrit",
-            },
-            context! {
-                name: &tracked.read().unwrap().name,
-                id: &id,
-                gpslog: gpslog.unwrap_or(true),
-                dbg: dbg.unwrap_or(false),
-            },
-        ))
-    } else {
-        None
-    }
-}
-
-fn evts_to_send(evt_queue: &RwLock<VecDeque<QueuedEvent>>) -> Vec<Event> {
-    evt_queue
-        .read()
-        .unwrap()
-        .iter()
-        .filter(|qevt| !qevt.expired())
-        .map(|qevt| qevt.evt.clone())
-        .collect()
-}
-
-fn evts_for(id: &str, evt_queues: &TrackingEventQueue) -> Vec<Event> {
-    evts_to_send(evt_queues.read().unwrap().get(&id.to_string()).unwrap())
-}
-
-#[get("/track/<id>/events")]
-fn tracked_events<'a>(
-    id: &'a str,
-    evt_queue: &'a State<TrackingEventQueue>,
-    mut shutdown: Shutdown,
-) -> Option<EventStream![Event + 'a]> {
-    if evt_queue.read().unwrap().contains_key(&id.to_string()) {
-        Some(EventStream! {
-            let mut interval = time::interval(EVENT_TIMEOUT);
-            loop {
-                select!{
-                    _ = interval.tick() =>{
-                        for evt in evts_for(id, evt_queue){
-                            //println!("{:?}", evt);
-                            yield evt;
-                        }
-                    },
-                    _ = &mut shutdown => break
-                }
-            }
-        })
-    } else {
-        None
-    }
-}
-
-#[get("/admin?<tok>&<dbg>")]
-fn admin_page(
-    tok: Option<AdminKey>,
-    dbg: Option<bool>,
-    admin_key: &State<AdminKey>,
-) -> Option<Template> {
-    if tok == Some(admin_key.to_string()) {
-        Some(Template::render(
-            "admin",
-            context! { tok: tok.unwrap(), dbg: dbg.unwrap_or(false) },
-        ))
-    } else {
-        None
-    }
-}
-
-#[patch("/admin/<id>?<tok>", data = "<nstate>")]
-fn admin_set_state(
-    tok: Option<AdminKey>,
-    id: &str,
-    admin_key: &State<AdminKey>,
-    nstate: Json<TrackedState>,
-    tracking: &State<Tracking>,
-    evt_queue: &State<TrackingEventQueue>,
-    admin_queue: &State<AdminEventQueue>,
-) -> Option<()> {
-    if tok == Some(admin_key.to_string()) {
-        let tracking_lock = tracking.read().unwrap();
-        let tracked = tracking_lock.get(&id.to_string()).unwrap();
-        tracked.write().unwrap().state = nstate.into_inner();
-        state_update(&tracked.read().unwrap(), &evt_queue, &admin_queue);
-        Some(())
-    } else {
-        None
-    }
-}
-
-#[get("/admin/events?<tok>")]
-fn admin_events<'a>(
-    tok: Option<AdminKey>,
-    admin_key: &State<AdminKey>,
-    admin_queue: &'a State<AdminEventQueue>,
-    tracking: &State<Tracking>,
-    mut shutdown: Shutdown,
-) -> Option<EventStream![Event + 'a]> {
-    if tok == Some(admin_key.to_string()) {
-        let full_info: Vec<AdminTrackedInfo> = tracking
-            .read()
-            .unwrap()
-            .iter()
-            .map(|(_, tracked)| admin_view(&tracked.read().unwrap()))
-            .collect();
-        Some(EventStream! {
-            yield Event::json(&full_info).event("full_update");
-            let mut interval = time::interval(EVENT_TIMEOUT);
-            loop {
-                select!{
-                    _ = interval.tick() =>{
-                        for evt in evts_to_send(admin_queue){
-                            //println!("{:?}", evt);
-                            yield evt;
-                        }
-                    },
-                    _ = &mut shutdown => break
-                }
-            }
-        })
-    } else {
-        None
-    }
-}
-
-fn state_update(tracked: &Tracked, evt_queues: &TrackingEventQueue, admin_queue: &AdminEventQueue) {
-    evt_queues
-        .read()
-        .unwrap()
-        .get(&tracked.id)
-        .unwrap()
-        .write()
-        .unwrap()
-        .push_back(Event::json(&admin_view(tracked)).event("self_info").into());
-    admin_queue
-        .write()
-        .unwrap()
-        .push_back(Event::json(&admin_view(tracked)).event("update").into());
-}
-
-#[put("/track/<id>/pos?<lat>&<long>")]
-fn store_pos(
-    id: &str,
-    lat: f32,
-    long: f32,
-    tracking: &State<Tracking>,
-    evt_queues: &State<TrackingEventQueue>,
-    admin_queue: &State<AdminEventQueue>,
-) {
-    if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
-        tracked.write().unwrap().pos = (lat, long);
-        state_update(&tracked.read().unwrap(), &evt_queues, &admin_queue);
-    }
-}
-
-#[put("/track/<id>/state?<inv>&<col>")]
-fn set_state(
-    id: &str,
-    inv: bool,
-    col: u8,
-    tracking: &State<Tracking>,
-    evt_queues: &State<TrackingEventQueue>,
-    admin_queue: &State<AdminEventQueue>,
-) -> Option<()> {
-    let tracking_lock = tracking.read().unwrap();
-    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
-    if let Vieux {
-        ref mut invisible,
-        ref mut color,
-    } = tracked.state
-    {
-        *invisible = inv;
-        *color = col;
-        state_update(&tracked, &evt_queues, &admin_queue);
-        Some(())
-    } else {
-        None
-    }
-}
-
-#[put("/track/<id>/vanish")]
-async fn activate_invisibility(
-    id: &str,
-    tracking: &State<Tracking>,
-    evt_queues: &State<TrackingEventQueue>,
-    admin_queue: &State<AdminEventQueue>,
-) -> Option<()> {
-    let tracking_lock = tracking.read().unwrap();
-    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
-    if let Conscrit {
-        ref mut invisible,
-        ref mut invisibility_codes,
-        ..
-    } = tracked.state
-    {
-        if *invisibility_codes > 0 {
-            *invisibility_codes -= 1;
-            *invisible = true;
-            state_update(&tracked, &evt_queues, &admin_queue);
-            let track_clone = (*tracking).clone();
-            let queue_clone = (*evt_queues).clone();
-            let admin_clone = (*admin_queue).clone();
-            let id_str = id.to_string();
-            tokio::spawn(async move {
-                sleep(BONUS_TIMEOUT).await;
-                if let Conscrit {
-                    ref mut invisible, ..
-                } = track_clone
-                    .read()
-                    .unwrap()
-                    .get(&id_str)
-                    .unwrap()
-                    .write()
-                    .unwrap()
-                    .state
-                {
-                    *invisible = false;
-                }
-                state_update(
-                    &track_clone
-                        .read()
-                        .unwrap()
-                        .get(&id_str)
-                        .unwrap()
-                        .read()
-                        .unwrap(),
-                    &queue_clone,
-                    &admin_clone,
-                );
-            });
-            Some(())
-        } else {
-            None
-        }
-    } else {
-        None
-    }
-}
-
-#[put("/track/<id>/blur")]
-async fn activate_blur(
-    id: &str,
-    tracking: &State<Tracking>,
-    evt_queues: &State<TrackingEventQueue>,
-    admin_queue: &State<AdminEventQueue>,
-) -> Option<()> {
-    let tracking_lock = tracking.read().unwrap();
-    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
-    if let Conscrit {
-        ref mut blurred,
-        ref mut blur_codes,
-        ..
-    } = tracked.state
-    {
-        if *blur_codes > 0 {
-            *blur_codes -= 1;
-            *blurred = true;
-            state_update(&tracked, &evt_queues, &admin_queue);
-            let track_clone = (*tracking).clone();
-            let queue_clone = (*evt_queues).clone();
-            let admin_clone = (*admin_queue).clone();
-            let id_str = id.to_string();
-            tokio::spawn(async move {
-                sleep(BONUS_TIMEOUT).await;
-                if let Conscrit {
-                    ref mut blurred, ..
-                } = track_clone
-                    .read()
-                    .unwrap()
-                    .get(&id_str)
-                    .unwrap()
-                    .write()
-                    .unwrap()
-                    .state
-                {
-                    *blurred = false;
-                }
-                state_update(
-                    &track_clone
-                        .read()
-                        .unwrap()
-                        .get(&id_str)
-                        .unwrap()
-                        .read()
-                        .unwrap(),
-                    &queue_clone,
-                    &admin_clone,
-                );
-            });
-            Some(())
-        } else {
-            None
-        }
-    } else {
-        None
-    }
-}
+mod admin;
+mod global;
+mod track;
+use global::*;
 
 #[get("/")]
 fn index() -> &'static str {
@@ -638,21 +100,9 @@ async fn rocket() -> _ {
         .manage(evt_queue.clone())
         .manage(admin_evt_queue.clone())
         .manage(key)
-        .mount(
-            "/",
-            routes![
-                index,
-                store_pos,
-                tracked_view,
-                tracked_events,
-                set_state,
-                admin_page,
-                admin_events,
-                admin_set_state,
-                activate_invisibility,
-                activate_blur,
-            ],
-        )
+        .mount("/", routes![index])
+        .mount("/track", track::routes())
+        .mount("/admin", admin::routes())
         .mount("/", FileServer::from(relative!("static")));
     tokio::spawn(async move {
         let mut clean_interval = time::interval(5 * EVENT_TIMEOUT);
diff --git a/src/track.rs b/src/track.rs
new file mode 100644
index 0000000..6b8c962
--- /dev/null
+++ b/src/track.rs
@@ -0,0 +1,235 @@
+use rocket::{
+    response::stream::{Event, EventStream},
+    tokio::{
+        self, select,
+        time::{self, sleep},
+    },
+    Route, Shutdown, State,
+};
+use rocket_dyn_templates::{context, Template};
+
+use crate::global::{TrackedState::*, *};
+
+#[get("/<id>?<gpslog>&<dbg>")]
+fn tracked_view(
+    id: &str,
+    gpslog: Option<bool>,
+    dbg: Option<bool>,
+    tracking: &State<Tracking>,
+) -> Option<Template> {
+    if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
+        Some(Template::render(
+            match tracked.read().unwrap().state {
+                Vieux { .. } => "vieux",
+                Conscrit { .. } => "conscrit",
+            },
+            context! {
+                name: &tracked.read().unwrap().name,
+                id: &id,
+                gpslog: gpslog.unwrap_or(true),
+                dbg: dbg.unwrap_or(false),
+            },
+        ))
+    } else {
+        None
+    }
+}
+
+fn evts_for(id: &str, evt_queues: &TrackingEventQueue) -> Vec<Event> {
+    evts_to_send(evt_queues.read().unwrap().get(&id.to_string()).unwrap())
+}
+
+#[get("/<id>/events")]
+fn tracked_events<'a>(
+    id: &'a str,
+    evt_queue: &'a State<TrackingEventQueue>,
+    mut shutdown: Shutdown,
+) -> Option<EventStream![Event + 'a]> {
+    if evt_queue.read().unwrap().contains_key(&id.to_string()) {
+        Some(EventStream! {
+            let mut interval = time::interval(EVENT_TIMEOUT);
+            loop {
+                select!{
+                    _ = interval.tick() =>{
+                        for evt in evts_for(id, evt_queue){
+                            //println!("{:?}", evt);
+                            yield evt;
+                        }
+                    },
+                    _ = &mut shutdown => break
+                }
+            }
+        })
+    } else {
+        None
+    }
+}
+
+#[put("/<id>/pos?<lat>&<long>")]
+fn store_pos(
+    id: &str,
+    lat: f32,
+    long: f32,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) {
+    if let Some(tracked) = tracking.read().unwrap().get(&id.to_string()) {
+        tracked.write().unwrap().pos = (lat, long);
+        state_update(&tracked.read().unwrap(), &evt_queues, &admin_queue);
+    }
+}
+
+#[put("/<id>/state?<inv>&<col>")]
+fn set_state(
+    id: &str,
+    inv: bool,
+    col: u8,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) -> Option<()> {
+    let tracking_lock = tracking.read().unwrap();
+    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
+    if let Vieux {
+        ref mut invisible,
+        ref mut color,
+    } = tracked.state
+    {
+        *invisible = inv;
+        *color = col;
+        state_update(&tracked, &evt_queues, &admin_queue);
+        Some(())
+    } else {
+        None
+    }
+}
+
+#[put("/<id>/vanish")]
+pub async fn activate_invisibility(
+    id: &str,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) -> Option<()> {
+    let tracking_lock = tracking.read().unwrap();
+    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
+    if let Conscrit {
+        ref mut invisible,
+        ref mut invisibility_codes,
+        ..
+    } = tracked.state
+    {
+        if *invisibility_codes > 0 {
+            *invisibility_codes -= 1;
+            *invisible = true;
+            state_update(&tracked, &evt_queues, &admin_queue);
+            let track_clone = (*tracking).clone();
+            let queue_clone = (*evt_queues).clone();
+            let admin_clone = (*admin_queue).clone();
+            let id_str = id.to_string();
+            tokio::spawn(async move {
+                sleep(BONUS_TIMEOUT).await;
+                if let Conscrit {
+                    ref mut invisible, ..
+                } = track_clone
+                    .read()
+                    .unwrap()
+                    .get(&id_str)
+                    .unwrap()
+                    .write()
+                    .unwrap()
+                    .state
+                {
+                    *invisible = false;
+                }
+                state_update(
+                    &track_clone
+                        .read()
+                        .unwrap()
+                        .get(&id_str)
+                        .unwrap()
+                        .read()
+                        .unwrap(),
+                    &queue_clone,
+                    &admin_clone,
+                );
+            });
+            Some(())
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+#[put("/<id>/blur")]
+pub async fn activate_blur(
+    id: &str,
+    tracking: &State<Tracking>,
+    evt_queues: &State<TrackingEventQueue>,
+    admin_queue: &State<AdminEventQueue>,
+) -> Option<()> {
+    let tracking_lock = tracking.read().unwrap();
+    let tracked = &mut tracking_lock.get(&id.to_string()).unwrap().write().unwrap();
+    if let Conscrit {
+        ref mut blurred,
+        ref mut blur_codes,
+        ..
+    } = tracked.state
+    {
+        if *blur_codes > 0 {
+            *blur_codes -= 1;
+            *blurred = true;
+            state_update(&tracked, &evt_queues, &admin_queue);
+            let track_clone = (*tracking).clone();
+            let queue_clone = (*evt_queues).clone();
+            let admin_clone = (*admin_queue).clone();
+            let id_str = id.to_string();
+            tokio::spawn(async move {
+                sleep(BONUS_TIMEOUT).await;
+                if let Conscrit {
+                    ref mut blurred, ..
+                } = track_clone
+                    .read()
+                    .unwrap()
+                    .get(&id_str)
+                    .unwrap()
+                    .write()
+                    .unwrap()
+                    .state
+                {
+                    *blurred = false;
+                }
+                state_update(
+                    &track_clone
+                        .read()
+                        .unwrap()
+                        .get(&id_str)
+                        .unwrap()
+                        .read()
+                        .unwrap(),
+                    &queue_clone,
+                    &admin_clone,
+                );
+            });
+            Some(())
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+pub fn routes() -> Vec<Route> {
+    routes![
+        store_pos,
+        tracked_view,
+        tracked_events,
+        set_state,
+        activate_invisibility,
+        activate_blur,
+    ]
+}
-- 
2.47.0


From 217a273f0b61710b25659bd115e9b709af8b500d Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Thu, 13 Jun 2024 12:54:26 +0200
Subject: [PATCH 14/14] =?UTF-8?q?nginx=20s=C3=A9partion=20for=20static=20s?=
 =?UTF-8?q?erving?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore  |  1 +
 nix/vm.nix  | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 shell.nix   |  2 +-
 src/main.rs |  4 +---
 4 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 nix/vm.nix

diff --git a/.gitignore b/.gitignore
index 3ea2906..0d88ed5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .envrc
 .direnv
+/nixos.qcow2
 
 # Added by cargo
 
diff --git a/nix/vm.nix b/nix/vm.nix
new file mode 100644
index 0000000..30237d5
--- /dev/null
+++ b/nix/vm.nix
@@ -0,0 +1,62 @@
+{ pkgs, lib, ... }:
+{
+  nix = {
+    nixPath = [
+      "nixpkgs=${builtins.storePath pkgs.path}"
+      "nixos=${builtins.storePath pkgs.path}"
+    ];
+    package = pkgs.lix;
+  };
+  environment.systemPackages = with pkgs; [ wget tmux ];
+  services.nginx = {
+    enable = true;
+    virtualHosts."localhost" = {
+      default = true;
+      locations = {
+        "/" = {
+          root = "/traque/static";
+          tryFiles = "$uri @backend";
+        };
+        "@backend" = {
+          recommendedProxySettings = true;
+          proxyPass = "http://localhost:8000";
+          extraConfig = ''
+            proxy_set_header Connection ''';
+            proxy_http_version 1.1;
+            chunked_transfer_encoding off;
+            proxy_buffering off;
+            proxy_cache off;
+          '';
+        };
+      };
+      #extraConfig = ''
+      #  error_page 502 =503;
+      #'';
+    };
+  };
+  services.getty = {
+    autologinUser = "root";
+    helpLine = lib.mkForce ''
+      On serial console: type Ctrl-a c to switch to the qemu console and `quit` to stop the VM.
+      traque source is on /traque (rw), `cd /traque && ./target/debug/traque` to run the test.
+      Compile from the host for performance (the VM is highly limited).'';
+  };
+  nixos-shell.mounts = {
+    mountHome = false;
+    mountNixProfile = false;
+    cache = "none";
+    extraMounts = {
+      "/traque" =  {
+        target = toString ../.;
+        cache = "none";
+      };
+    };
+  };
+  virtualisation = {
+    forwardPorts = [
+      { from = "host"; host.port = 8000; guest.port = 80; }
+    ];
+  };
+
+  system.stateVersion = "24.11";
+}
diff --git a/shell.nix b/shell.nix
index eaa9a72..b21d197 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
 { pkgs ? (import <nixpkgs>) { }, lib ? pkgs.lib}:
 pkgs.mkShell {
-  buildInputs = with pkgs; [ cargo rustc rustfmt ];
+  buildInputs = with pkgs; [ cargo rustc rustfmt nixos-shell ];
 }
diff --git a/src/main.rs b/src/main.rs
index 64d1ea1..65a28fd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 #[macro_use]
 extern crate rocket;
 use rocket::{
-    fs::{relative, FileServer},
     response::stream::Event,
     tokio::{
         self, select,
@@ -102,8 +101,7 @@ async fn rocket() -> _ {
         .manage(key)
         .mount("/", routes![index])
         .mount("/track", track::routes())
-        .mount("/admin", admin::routes())
-        .mount("/", FileServer::from(relative!("static")));
+        .mount("/admin", admin::routes());
     tokio::spawn(async move {
         let mut clean_interval = time::interval(5 * EVENT_TIMEOUT);
         let mut coord_interval = time::interval(Duration::from_millis(3000));
-- 
2.47.0