fix 500 template title

Reviewed-on: #3

.drone.yml

@@ -1,9 +1,10 @@
 kind: pipeline
+type: docker
 name: default
 
 steps:
 - name: build
-  image: rustlang/rust:nightly-alpine
+  image: rust:1-alpine
   commands:
   - apk add --no-cache musl-dev
   - cargo fetch

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "qchgk_web"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["Dmitry <b4tm4n@mail.ru>"]
 edition = "2021"
 license = "MIT"
@@ -11,18 +11,15 @@ readme = "README.md"
 
 [dependencies]
 rand="0.8"
-serde="1.0"
+rocket = { version = "=0.5.0-rc.3", features = ["json"] }
-serde_json="1.0"
+rocket_dyn_templates = { version = "=0.1.0-rc.3", features = ["tera"] }
-rocket="0.4"
+chgk_ledb_lib = {git = "https://gitea.b4tman.ru/b4tman/chgk_ledb.git", rev="699478f85e", package="chgk_ledb_lib", features=["async"]}
-chgk_ledb_lib = {git = "https://gitea.b4tman.ru/b4tman/chgk_ledb.git", rev="8120a996a3", package="chgk_ledb_lib"}
+mini-moka = "0.10.0"
-
+lazy_static = "1.4.0"
-[dependencies.rocket_contrib]
-version = "0.4"
-default-features = false
-features = ["serve", "tera_templates"]
 
 [profile.release]
 opt-level = 3
 debug = false
 lto = true
 strip = true
+

src/main.rs

@@ -1,27 +1,36 @@
-#![feature(proc_macro_hygiene, decl_macro)]
-
-extern crate serde;
-extern crate serde_json;
-
 #[macro_use]
 extern crate rocket;
-extern crate rocket_contrib;
 
+use rocket::fs::FileServer;
+use rocket::fs::Options;
+use rocket::http::ContentType;
+use rocket::request::Request;
 use rocket::response::Redirect;
-use rocket::{Rocket, State};
+use rocket::response::{self, Responder, Response};
-use rocket_contrib::serve::StaticFiles;
+use rocket::State;
-use rocket_contrib::templates::Template;
+use rocket_dyn_templates::tera;
+use rocket_dyn_templates::Template;
 
 use rand::distributions::Uniform;
 use rand::Rng;
 
+use lazy_static::lazy_static;
+use std::collections::HashMap;
+use std::ops::Deref;
 use std::sync::Arc;
 
-use chgk_ledb_lib::db;
+use chgk_ledb_lib::async_db;
 use chgk_ledb_lib::questions::Question;
 
+use mini_moka::sync::Cache;
+use std::time::Duration;
+
 const DB_FILENAME: &str = "db.dat";
 
+lazy_static! {
+    static ref EMPTY_MAP: HashMap<String, String> = HashMap::new();
+}
+
 trait ErrorEmpty {
     type Output;
     fn err_empty(self) -> Result<Self::Output, ()>;
@@ -34,9 +43,62 @@ impl<T, E> ErrorEmpty for Result<T, E> {
     }
 }
 
-type DataBaseInner = db::Reader<Question>;
+#[derive(Debug, Responder)]
+enum WebError {
+    #[response(status = 404)]
+    NotFound(Template),
+    #[response(status = 500)]
+    ServerError(Template),
+}
+
+impl WebError {
+    fn not_found() -> Self {
+        WebError::NotFound(Template::render("404", EMPTY_MAP.deref()))
+    }
+    fn server_error() -> Self {
+        WebError::ServerError(Template::render("500", EMPTY_MAP.deref()))
+    }
+}
+
+/// wrapper for terra:Value (json, context), to cache values by ref
+/// implements Responder as json content type
+#[derive(Clone)]
+struct ArcTemplateData {
+    value: Arc<tera::Value>,
+}
+
+impl Deref for ArcTemplateData {
+    type Target = tera::Value;
+
+    fn deref(&self) -> &Self::Target {
+        self.value.deref()
+    }
+}
+
+impl ArcTemplateData {
+    fn new(value: tera::Value) -> ArcTemplateData {
+        ArcTemplateData {
+            value: Arc::new(value),
+        }
+    }
+    fn render(&self, name: &'static str) -> Template {
+        Template::render(name, self.deref())
+    }
+}
+
+impl<'r> Responder<'r, 'static> for ArcTemplateData {
+    fn respond_to(self, req: &'r Request<'_>) -> response::Result<'static> {
+        Response::build_from(self.to_string().respond_to(req)?)
+            .header(ContentType::JSON)
+            .ok()
+    }
+}
+
+type TemplateCache = mini_moka::sync::Cache<usize, ArcTemplateData>;
+
+type DataBaseInner = async_db::Reader<Question>;
 type DataBase = Arc<DataBaseInner>;
-struct AppState{
+struct AppState {
     db: DataBase,
     database_distribution: Uniform<usize>,
 }
@@ -49,7 +111,7 @@ impl From<DataBaseInner> for AppState {
 
         Self {
             db,
-            database_distribution
+            database_distribution,
         }
     }
 }
@@ -59,36 +121,71 @@ fn random_question_id(database_distribution: &Uniform<usize>) -> usize {
     rng.sample(database_distribution)
 }
 
-fn get_question(db: &DataBase, id: usize) -> Result<Question, ()> {
+async fn get_question(db: &DataBase, id: usize) -> Result<Question, ()> {
-    db.get(id - 1).err_empty()
+    db.get(id - 1).await.err_empty()
 }
 
-fn show_question_details(template_name: &'static str, data: &AppState, id: usize) -> Template {
+async fn get_question_data(
-    match get_question(&data.db, id) {
+    data: &AppState,
+    cache: &TemplateCache,
+    id: usize,
+) -> Option<ArcTemplateData> {
+    if let Some(value) = cache.get(&id) {
+        return Some(value);
+    }
+
+    match get_question(&data.db, id).await {
         Ok(question) => {
-            let mut context = serde_json::to_value(question).expect("question serialize");
+            let mut context = tera::to_value(question).expect("question serialize");
             if context.is_object() {
                 let next_id = random_question_id(&data.database_distribution);
-                context["next"] = serde_json::to_value(next_id).expect("question id serialize");
+                context["next"] = tera::to_value(next_id).expect("question id serialize");
             }
-            Template::render(template_name, &context)
+
-        }
+            let data = ArcTemplateData::new(context);
-        Err(_) => {
+            cache.insert(id, data.clone());
-            use std::collections::HashMap;
+            Some(data)
-            let context: HashMap<String, String> = HashMap::new();
-            Template::render("404", context)
         }
+        Err(_) => None,
     }
 }
 
+async fn show_question_details(
+    template_name: &'static str,
+    data: &AppState,
+    cache: &TemplateCache,
+    id: usize,
+) -> Option<Template> {
+    get_question_data(data, cache, id)
+        .await
+        .map(|data| data.render(template_name))
+}
+
+#[get("/q/<id>/json")]
+async fn json_question(
+    data: &State<AppState>,
+    cache: &State<TemplateCache>,
+    id: usize,
+) -> Option<ArcTemplateData> {
+    get_question_data(data.inner(), cache.inner(), id).await
+}
+
 #[get("/q/<id>")]
-fn show_question(data: State<AppState>, id: usize) -> Template {
+async fn show_question(
-    show_question_details("question", data.inner(), id)
+    data: &State<AppState>,
+    cache: &State<TemplateCache>,
+    id: usize,
+) -> Option<Template> {
+    show_question_details("question", data.inner(), cache.inner(), id).await
 }
 
 #[get("/q/<id>/a")]
-fn show_answer(data: State<AppState>, id: usize) -> Template {
+async fn show_answer(
-    show_question_details("answer", data.inner(), id)
+    data: &State<AppState>,
+    cache: &State<TemplateCache>,
+    id: usize,
+) -> Option<Template> {
+    show_question_details("answer", data.inner(), cache.inner(), id).await
 }
 
 #[get("/q/0")]
@@ -101,34 +198,56 @@ fn answer0() -> Redirect {
     Redirect::to("/")
 }
 
+#[get("/q/0/json")]
+fn json0(data: &State<AppState>) -> Redirect {
+    let id = random_question_id(&data.database_distribution);
+    Redirect::temporary(format!("/q/{}/json", id))
+}
+
 #[get("/")]
-fn index(data: State<AppState>) -> Redirect {
+fn index(data: &State<AppState>) -> Redirect {
     let id = random_question_id(&data.database_distribution);
     Redirect::temporary(format!("/q/{}", id))
 }
 
 #[catch(404)]
-fn not_found(_req: &rocket::Request) -> Template {
+fn not_found(_req: &rocket::Request) -> WebError {
-    use std::collections::HashMap;
+    WebError::not_found()
-    let context: HashMap<String, String> = HashMap::new();
-    Template::render("404", context)
 }
 
-fn rocket() -> Rocket {
+#[catch(500)]
-    let state: AppState = db::Reader::new(DB_FILENAME, 2048).expect("open db").into();
+fn server_error(_req: &rocket::Request) -> WebError {
+    WebError::server_error()
+}
 
-    rocket::ignite()
+#[launch]
+async fn rocket() -> _ {
+    let state: AppState = async_db::Reader::new(DB_FILENAME)
+        .await
+        .expect("open db")
+        .into();
+    let cache: TemplateCache = Cache::builder()
+        .time_to_idle(Duration::from_secs(15 * 60))
+        .max_capacity(300)
+        .build();
+
+    rocket::build()
         .manage(state)
-        .register(catchers![not_found])
+        .manage(cache)
+        .register("/", catchers![not_found, server_error])
         .mount(
             "/",
-            routes![index, show_question, show_answer, question0, answer0],
+            routes![
+                index,
+                json_question,
+                show_question,
+                show_answer,
+                question0,
+                answer0,
+                json0
+            ],
         )
         .mount("/q", routes![index])
-        .mount("/q/static", StaticFiles::from("static/"))
+        .mount("/q/static", FileServer::new("static/", Options::None))
         .attach(Template::fairing())
 }
-
-fn main() {
-    rocket().launch();
-}

templates/404.html.tera

@@ -1,5 +1,13 @@
 {% extends "base" %}
 {% block title %}404{% endblock title %}
+{% block nav %} 
+{% endblock nav %}
 {% block content %}
-  <h1>404 - Could not find that page</h1>
+  <div class="content-block">
+    <div class="content-block-inner mt-4 px-4 py-2 fs-1 top-50 start-50 translate-middle">
+  <h1 class="display-4 d-flex justify-content-center text-center fw-bold">404</h1>
+  <br/>
+  <p>Нет такой страницы &#128532;</p>
+  </div>
+  </div>
 {% endblock content %}

templates/500.html.tera

@@ -0,0 +1,13 @@
+{% extends "base" %}
+{% block title %}500{% endblock title %}
+{% block nav %} 
+{% endblock nav %}
+{% block content %}
+  <div class="content-block">
+    <div class="content-block-inner mt-4 px-4 py-2 fs-1 top-50 start-50 translate-middle">
+  <h1 class="display-4 d-flex justify-content-center text-center fw-bold">500</h1>
+  <br/>
+  <p>&#128558; Ой, кажется у нас тут что то сломалось...</p>
+  </div>
+  </div>
+{% endblock content %}

templates/answer.html.tera

@@ -42,7 +42,7 @@
             <p><span>Тема: </span> {{ theme }}</p>
             {% endif %}
             {% if rating | length %}
-            <p><span>Рейтинг: </span> {{ author }}</p>
+            <p><span>Рейтинг: </span> {{ rating }}</p>
             {% endif %}
             {% if batch_info.description | length %}
             <p><span>Чемпионат: </span> {{ batch_info.description }}</p>
@@ -53,6 +53,8 @@
             {% if id | length %}
             <p><span>Номер: </span> {{ id }}</p>
             {% endif %}
+            <br/>
+            <p class="text-muted"> Показать как <a href="/q/{{ num }}/json">json</a></p>
         </div></details>
     </div>
     <br />