test concurent get q from db/cache

Reviewed-on: #3

.drone.yml

@@ -0,0 +1,13 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: build
+  image: rust:1-alpine
+  commands:
+  - apk add --no-cache musl-dev
+  - cargo fetch
+  - cargo build --all
+  environment:
+    CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse

.gitignore

@@ -1,4 +1,4 @@
 /target
 **/*.rs.bk
-
-/db
+db.dat
+/db

Cargo.toml

@@ -1,24 +1,24 @@
 [package]
 name = "qchgk_web"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Dmitry <b4tm4n@mail.ru>"]
-edition = "2018"
+edition = "2021"
+license = "MIT"
+readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
 [dependencies]
-actix-files="0.1"
-actix-web = "1.0"
-serde="1.0"
-serde_derive="1.0"
-serde_json="1.0"
-ledb="0.2"
-ledb-derive="0.2"
-ledb-types="0.2"
-lmdb-zero="0.4"
-rand="0.7"
-env_logger = "0.6"
-tera = "0.11"
-# actix="0.7"
-# tokio="0.1"
-# futures="0.1"
+rand="0.8"
+rocket = { version = "=0.5.0-rc.3", features = ["json"] }
+rocket_dyn_templates = { version = "=0.1.0-rc.3", features = ["tera"] }
+chgk_ledb_lib = {git = "https://gitea.b4tman.ru/b4tman/chgk_ledb.git", rev="699478f85e", package="chgk_ledb_lib", features=["async"]}
+mini-moka = "0.10.0"
+
+[profile.release]
+opt-level = 3
+debug = false
+lto = true
+strip = true
+

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Dmitry Belyaev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,10 @@
+# qchgk_web
+
+Простой веб интерфейс к базе вопросов ЧГК
+
+## Ссылки
+
+- Источник вопросов: http://db.chgk.info
+- Копия файлов базы вопросов: https://gitlab.com/b4tman/db_chgk
+- Конвертор в JSON: https://gitea.b4tman.ru/b4tman/chgk_txt2json
+- Загрузчик в формат базы для этой штуки: https://gitea.b4tman.ru/b4tman/chgk_ledb

src/main.rs

@@ -1,235 +1,192 @@
-// extern crate actix;
-extern crate actix_files;
-extern crate actix_web;
-extern crate serde;
 #[macro_use]
-extern crate serde_derive;
-#[macro_use]
-extern crate serde_json;
-#[macro_use]
-extern crate ledb;
-#[macro_use]
-extern crate ledb_derive;
-extern crate env_logger;
-extern crate ledb_types;
-#[macro_use]
-extern crate tera;
+extern crate rocket;
 
-use tera::Context;
+use rocket::fs::FileServer;
+use rocket::futures::FutureExt;
+use rocket::response::Redirect;
+use rocket::State;
+use rocket_dyn_templates::tera;
+use rocket_dyn_templates::Template;
 
-// extern crate futures;
+use rand::distributions::Uniform;
+use rand::Rng;
 
-// extern crate tokio;
+use std::ops::Deref;
+use std::sync::Arc;
 
-use actix_web::{
-    error, guard, http::header, http::Method, middleware::Logger, middleware::NormalizePath, web,
-    App, Error, HttpRequest, HttpResponse, HttpServer, Responder, Result,
-};
-use std::cell::Cell;
+use chgk_ledb_lib::async_db;
+use chgk_ledb_lib::questions::Question;
 
-use rand::seq::IteratorRandom;
-use std::time::Instant;
+use mini_moka::sync::Cache;
+use std::time::Duration;
 
-use std::{fs, io};
-// use tokio::spawn;
-// use futures::{Future};
+const DB_FILENAME: &str = "db.dat";
 
-// use actix::Actor;
-// use actix::System;
-
-//use crate::tokio::prelude::Future;
-
-//use ledb_actix::{Document, Options, Storage, StorageAddrExt};
-
-use ledb::{Options, Storage};
-
-#[derive(Debug, Default, Clone, Serialize, Deserialize, Document)]
-struct BatchInfo {
-    #[document(primary)]
-    #[serde(default)]
-    filename: String,
-    #[serde(default)]
-    description: String,
-    #[serde(default)]
-    author: String,
-    #[serde(default)]
-    comment: String,
-    #[serde(default)]
-    url: String,
-    #[serde(default)]
-    date: String,
-    #[serde(default)]
-    processed_by: String,
-    #[serde(default)]
-    redacted_by: String,
-    #[serde(default)]
-    copyright: String,
-    #[serde(default)]
-    theme: String,
-    #[serde(default)]
-    kind: String,
-    #[serde(default)]
-    source: String,
-    #[serde(default)]
-    rating: String,
+trait ErrorEmpty {
+    type Output;
+    fn err_empty(self) -> Result<Self::Output, ()>;
 }
 
-#[derive(Debug, Default, Clone, Serialize, Deserialize, Document)]
-struct Question {
-    #[document(primary)]
-    #[serde(default)]
-    num: u32,
-    #[document(index)]
-    id: String,
-
-    description: String,
-    answer: String,
-
-    #[serde(default)]
-    author: String,
-    #[serde(default)]
-    comment: String,
-    #[serde(default)]
-    comment1: String,
-    #[serde(default)]
-    tour: String,
-    #[serde(default)]
-    url: String,
-    #[serde(default)]
-    date: String,
-    #[serde(default)]
-    processed_by: String,
-    #[serde(default)]
-    redacted_by: String,
-    #[serde(default)]
-    copyright: String,
-    #[serde(default)]
-    theme: String,
-    #[serde(default)]
-    kind: String,
-    #[serde(default)]
-    source: String,
-    #[serde(default)]
-    rating: String,
-    #[document(nested)]
-    #[serde(default)]
-    batch_info: BatchInfo,
+impl<T, E> ErrorEmpty for Result<T, E> {
+    type Output = T;
+    fn err_empty(self) -> Result<Self::Output, ()> {
+        self.map_err(|_| ())
+    }
 }
 
+#[derive(Clone)]
+struct ArcTemplateData {
+    value: Arc<tera::Value>,
+}
+
+impl ArcTemplateData {
+    fn new(value: tera::Value) -> ArcTemplateData {
+        ArcTemplateData {
+            value: Arc::new(value),
+        }
+    }
+    fn render(&self, name: &'static str) -> Template {
+        Template::render(name, self.value.deref())
+    }
+}
+
+type TemplateCache = mini_moka::sync::Cache<usize, ArcTemplateData>;
+
+type DataBaseInner = async_db::Reader<Question>;
+type DataBase = Arc<DataBaseInner>;
 struct AppState {
-    storage: Storage,
-    template: tera::Tera,
+    db: DataBase,
+    database_distribution: Uniform<usize>,
 }
 
-fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, Error> {
-    if 0 == id {
-        return Ok(None);
-    }
+impl From<DataBaseInner> for AppState {
+    fn from(db: DataBaseInner) -> Self {
+        let last_id = db.len();
+        let database_distribution = rand::distributions::Uniform::new_inclusive(1usize, last_id);
+        let db = Arc::new(db);
 
-    let collection = storage.collection("questions").unwrap();
-    let last_id = collection.last_id().unwrap();
-
-    if id > last_id {
-        Err(Error::from(()))
-    } else {
-        let question = collection.get::<Question>(id);
-        if question.is_err() {
-            Err(Error::from(()))
-        } else {
-            Ok(question.unwrap())
+        Self {
+            db,
+            database_distribution,
         }
     }
 }
 
-fn show_question_details(template_file: &str, data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> {
-    let id = id.into_inner();
-
-    let question = get_question(&data.storage, id);
-
-    if question.is_ok() {
-        let question = question.unwrap();
-
-        if question.is_some() {
-            let question = question.unwrap();
-            let body = data.template.render(template_file, &question).unwrap();
-            Ok(HttpResponse::Ok().content_type("text/html").body(body))
-        } else {
-            Ok(HttpResponse::Found()
-                .header(header::LOCATION, "/q/")
-                .finish())
-        }
-    } else {
-        let context = Context::new();
-        Ok(HttpResponse::with_body(
-            actix_web::http::StatusCode::NOT_FOUND,
-            actix_web::dev::Body::from(data.template.render("404.html", &context).unwrap()),
-        ))
-    }
-}
-
-fn show_question(data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> {
-    show_question_details("question.html", data, id)
-}
-
-fn show_answer(data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResponse, Error> {
-    show_question_details("answer.html", data, id)
-}
-
-fn index(data: web::Data<AppState>, req: HttpRequest) -> Result<HttpResponse, Error> {
-    let collection = data.storage.collection("questions").unwrap();
+fn random_question_id(database_distribution: &Uniform<usize>) -> usize {
     let mut rng = rand::thread_rng();
-    let last_id = collection.last_id().unwrap();
-    let id = (1..(last_id + 1)).choose(&mut rng).unwrap();
-
-    let url = req.url_for("question", &[format!("{}", id)])?;
-
-    Ok(HttpResponse::Found()
-        .header(header::LOCATION, url.as_str())
-        .finish())
+    rng.sample(database_distribution)
 }
 
-fn main() {
-    std::env::set_var("RUST_LOG", "actix_web=info");
-    env_logger::init();
-
-    let options: Options = serde_json::from_value(json!({
-    "read_only": true,
-    "no_lock": true,
-    }))
-    .unwrap();
-
-    let storage = Storage::new("db", options).unwrap();
-
-    HttpServer::new(move || {
-        let data = AppState {
-            storage: storage.clone(),
-            template: compile_templates!("./templates/**/*"),
-        };
-        App::new()
-            .wrap(Logger::default())
-            .data(data)
-            .route("/q", web::to(index))
-            .service(
-                web::scope("/q")
-                    .service(actix_files::Files::new("/static", "./static"))
-                    .service(
-                        web::resource("/{id}")
-                            .name("question") // <- set resource name, then it could be used in `url_for`
-                            .guard(guard::Get())
-                            .to(show_question),
-                    )
-                    .service(
-                        web::resource("/{id}/a/")
-                            .name("answer") // <- set resource name, then it could be used in `url_for`
-                            .guard(guard::Get())
-                            .to(show_answer),
-                    )
-                    .route("/", web::to(index))
-            )
-            .route("/", web::to(index))
-    })
-    .bind("127.0.0.1:8088")
-    .unwrap()
-    .run()
-    .unwrap();
+async fn get_question(db: &DataBase, id: usize) -> Result<Question, ()> {
+    db.get(id - 1).await.err_empty()
+}
+
+async fn show_question_details(
+    template_name: &'static str,
+    data: &AppState,
+    cache: &TemplateCache,
+    id: usize,
+) -> Template {
+    let cache_cloned = cache.clone();
+
+    let from_cache = rocket::tokio::spawn(async move { cache_cloned.get(&id) }).fuse();
+    let from_db = async move {
+        match get_question(&data.db, id).await {
+            Ok(question) => {
+                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"] = tera::to_value(next_id).expect("question id serialize");
+                }
+
+                let value = ArcTemplateData::new(context);
+                let result = value.render(template_name);
+                cache.insert(id, value);
+
+                result
+            }
+            Err(_) => {
+                use std::collections::HashMap;
+                let context: HashMap<String, String> = HashMap::new();
+                Template::render("404", context)
+            }
+        }
+    }
+    .fuse();
+
+    loop {
+        rocket::tokio::select! {
+            biased;
+
+            Ok(Some(template)) = from_cache => {
+                println!("from cache");
+                break template.render(template_name)
+            },
+            template = from_db => {
+                println!("from db");
+                break template
+            }
+        }
+    }
+}
+
+#[get("/q/<id>")]
+async fn show_question(
+    data: &State<AppState>,
+    cache: &State<TemplateCache>,
+    id: usize,
+) -> Template {
+    show_question_details("question", data.inner(), cache.inner(), id).await
+}
+
+#[get("/q/<id>/a")]
+async fn show_answer(data: &State<AppState>, cache: &State<TemplateCache>, id: usize) -> Template {
+    show_question_details("answer", data.inner(), cache.inner(), id).await
+}
+
+#[get("/q/0")]
+fn question0() -> Redirect {
+    Redirect::to("/")
+}
+
+#[get("/q/0/a")]
+fn answer0() -> Redirect {
+    Redirect::to("/")
+}
+
+#[get("/")]
+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 {
+    use std::collections::HashMap;
+    let context: HashMap<String, String> = HashMap::new();
+    Template::render("404", context)
+}
+
+#[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)
+        .manage(cache)
+        .register("/", catchers![not_found])
+        .mount(
+            "/",
+            routes![index, show_question, show_answer, question0, answer0],
+        )
+        .mount("/q", routes![index])
+        .mount("/q/static", FileServer::from("static/"))
+        .attach(Template::fairing())
 }

static/style.css

@@ -9,3 +9,30 @@ body {
 .content-block-inner {
     margin: auto;
 }
+
+.footer {
+    text-align: center;
+    z-index: -1;
+}
+
+details {
+    text-align: center;
+}
+
+#details {
+    text-align: justify;
+}
+
+.nav-link {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+.navbar {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}

templates/404.html.tera

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base" %}
 {% block title %}404{% endblock title %}
 {% block content %}
   <h1>404 - Could not find that page</h1>

templates/answer.html.tera

@@ -1,23 +1,22 @@
-{% extends "base.html" %} {% block title %} Ответ {% endblock title %}
-
+{% extends "base" %} {% block title %} Ответ {% endblock title %}
+{% block nav %} 
+<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
+{% endblock nav %}
 {% block content %}
 <!-- <h1>{{ id }}</h1> -->
 <div class="content-block">
     <div id="question" class="content-block-inner">
-        <p><font color="#544669">
-            <h4> {{ description }} </h4>
-        </font>
+        <p>
+            <h4 class="text-muted"> {{ description }} </h4>
         </p>
     </div>
 </div><br />
 <div class="content-block">
     <div id="answer" class="content-block-inner">
-        <hr/>
-        <p>
-            <!-- <h2> Ответ: </h2> -->
-            <h1>{{ answer }}</h1>
-        </p>
-        <hr/><br><br/><details>
+        <div class="mt-2 px-2 py-1 shadow rounded">        
+            <!-- <h2> Ответ: </h2>  -->
+            <h1 class="display-4 d-flex justify-content-center text-center">{{ answer }}</h1>
+        </div><br><br/><details>
         <div id="details">
             {% if comment | length or comment1 | length %}
             <p><span>Комментарии:</span>

templates/base.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-  <link rel="stylesheet" type="text/css" href="/q/static/style.css" />
-  <title>{% block title %}{% endblock title %}</title>
-</head>
-<body>
-    {% include "nav.html" %}
-    <div id="content" class="container">{% block content %}{% endblock content %}</div>
-</body>
-</html>

templates/base.html.tera

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" type="text/css" href="/q/static/bootstrap.min.css">
+  <link rel="stylesheet" type="text/css" href="/q/static/style.css" />
+  <title>{% block title %}{% endblock title %}</title>
+</head>
+<body>
+    <header class="shadow-sm rounded-bottom">
+    <nav class="navbar navbar-expand-sm container sticky-top navbar-light justify-content-center">
+    <ul class="nav navbar-nav">
+    {% include "nav" %}
+    {% block nav %}{% endblock nav %}
+    </ul>
+    </nav>
+    </header>
+    <article class="mb-5 pb-5">
+    <div id="content" class="container">{% block content %}{% endblock content %}</div>
+    </article>
+<footer class="footer fixed-bottom shadow-lg rounded-top">
+<p class="my-0 py-0 text-secondary">Источник: <a class="text-secondary" href="https://db.chgk.info/">db.chgk.info</a></p>
+</footer>
+<!-- Yandex.Metrika counter --> <script type="text/javascript" > (function (d, w, c) { (w[c] = w[c] || []).push(function() { try { w.yaCounter48214757 = new Ya.Metrika2({ id:48214757, clickmap:true, trackLinks:true, accurateTrackBounce:true, trackHash:true, ut:"noindex" }); } catch(e) { } }); var n = d.getElementsByTagName("script")[0], s = d.createElement("script"), f = function () { n.parentNode.insertBefore(s, n); }; s.type = "text/javascript"; s.async = true; s.src = "https://mc.yandex.ru/metrika/tag.js"; if (w.opera == "[object Opera]") { d.addEventListener("DOMContentLoaded", f, false); } else { f(); } })(document, window, "yandex_metrika_callbacks2"); </script> <noscript><div><img src="https://mc.yandex.ru/watch/48214757?ut=noindex" style="position:absolute; left:-9999px;" alt="" /></div></noscript> <!-- /Yandex.Metrika counter -->
+</body>
+</html>

templates/nav.html

@@ -1,3 +0,0 @@
-<nav class="nav nav-pills container justify-content-center">
-    <a class="nav-link" href="/q/">Ещё</a>
-</nav>

templates/nav.html.tera

@@ -0,0 +1 @@
+<li class="nav-item"><a class="nav-link text-info" href="/">Главная</a></li>

templates/question.html

@@ -1,17 +0,0 @@
-{% extends "base.html" %} {% block title %} Вопрос {% endblock title %} 
-
-{% block content %}
-<!-- <h1>{{ id }}</h1> -->
-<div class="content-block"><div id="question" class="content-block-inner">
-<p>
-    <h3> {{ description }} </h3>
-</p>
-</div></div>
-<br/>
-<br/>
-<br/><details>
-<nav class="nav nav-pills container justify-content-center">
-        <a class="nav-link" href="/q/{{ num }}/a/">Ответ</a>
-</nav></details>
-
-{% endblock content %}

templates/question.html.tera

@@ -0,0 +1,18 @@
+{% extends "base" %} {% block title %} Вопрос {% endblock title %} 
+{% block nav %} 
+<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
+{% endblock nav %}
+{% block content %}
+<!-- <h1>{{ id }}</h1> -->
+<div class="content-block"><div id="question" class="content-block-inner">
+<p>
+    <h3> {{ description }} </h3>
+</p>
+</div></div>
+<br/>
+<br/>
+<br/>
+<div class="justify-content-center text-center">
+<a class="btn btn-dark shadow" href="/q/{{ num }}/a/">Показать ответ</a>
+</div>
+{% endblock content %}