1.2.0: update dependencies / add api_url / frontend reverse ordering

actix/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "chhoto-url"
-version = "1.1.0"
+version = "1.2.0"
 edition = "2021"
 authors = ["Sayantan Santra <sayantan[dot]santra689[at]gmail[dot]com"]
 license = "mit"
@@ -27,14 +27,14 @@ categories = ["web-programming"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-actix-web = "4.5.1"
+actix-web = "4.10.2"
-actix-files = "0.6.5"
+actix-files = "0.6.6"
-rusqlite = { version = "0.32.0", features = ["bundled"] }
+rusqlite = { version = "0.34.0", features = ["bundled"] }
-regex = "1.10.3"
+regex = "1.11.1"
-rand = "0.8.5"
+rand = "0.9.0"
-actix-session = { version = "0.10.0", features = ["cookie-session"] }
+actix-session = { version = "0.10.1", features = ["cookie-session"] }
-env_logger = "0.11.1"
+env_logger = "0.11.8"
 nanoid = "0.4.0"
-serde_json = "1.0.115"
+serde_json = "1.0.140"
-serde = { version = "1.0.197", features = [ "derive" ] }
+serde = { version = "1.0.219", features = [ "derive" ] }
-once_cell = "1.20.2"
+once_cell = "1.21.3"

actix/src/main.rs

@@ -38,6 +38,16 @@ async fn main() -> Result<()> {
         .ok()
         .filter(|s| !s.trim().is_empty());
 
+    let api_url = {
+        let mut get_api_url = env::var("api_url".replace("//", "/"))
+        .ok()
+        .unwrap_or_default();
+        if get_api_url.ends_with("/") {
+            get_api_url.pop();
+        }
+        get_api_url
+    };
+
     // Actually start the server
     HttpServer::new(move || {
         App::new()
@@ -59,16 +69,18 @@ async fn main() -> Result<()> {
                 middleware::DefaultHeaders::new()
             })
             .service(services::link_handler)
-            .service(services::getall)
+            .service(web::scope(&api_url)
-            .service(services::siteurl)
+                .service(services::getall)
-            .service(services::version)
+                .service(services::siteurl)
-            .service(services::add_link)
+                .service(services::version)
-            .service(services::edit_link)
+                .service(services::add_link)
-            .service(services::delete_link)
+                .service(services::edit_link)
-            .service(services::login)
+                .service(services::delete_link)
-            .service(services::gen_api_key)
+                .service(services::login)
-            .service(services::logout)
+                .service(services::gen_api_key)
-            .service(Files::new("/", "./resources/").index_file("index.html"))
+                .service(services::logout)
+                .service(Files::new("/", "./resources/").index_file("index.html"))
+        )
             .default_service(actix_web::web::get().to(services::error404))
     })
     .bind(("0.0.0.0", port))?

actix/src/utils.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 use nanoid::nanoid;
-use rand::seq::SliceRandom;
+use rand::seq::IndexedRandom;
 use regex::Regex;
 use rusqlite::Connection;
 use serde::Deserialize;
@@ -156,8 +156,8 @@ pub fn gen_api_key(db: &Connection) -> (bool, String) {
 // From: https://stackoverflow.com/a/74953997
 fn generate_string(len: usize) -> String {
     const CHARSET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
-    let one_char = || CHARSET[rng.gen_range(0..CHARSET.len())] as char;
+    let one_char = || CHARSET[rng.random_range(0..CHARSET.len())] as char;
     iter::repeat_with(one_char).take(len).collect()
 }
 
@@ -204,10 +204,10 @@ fn gen_link(style: String, len: usize) -> String {
         format!(
             "{0}-{1}",
             ADJECTIVES
-                .choose(&mut rand::thread_rng())
+                .choose(&mut rand::rng())
                 .expect("Error choosing random adjective."),
             NAMES
-                .choose(&mut rand::thread_rng())
+                .choose(&mut rand::rng())
                 .expect("Error choosing random name.")
         )
     }

compose.yaml

@@ -25,6 +25,16 @@ services:
 
             - password=TopSecretPass
 
+            # Change it in case you want to change the path of api and frontend
+            # THIS WILL NOT CHANGE THE PATH OF SHORTURL!
+            # Example:
+            # api_url=/ui/
+            #   UI          -> https://example.com/ui/
+            #   API         -> https://example.com/ui/api
+            #   SHORTLINK   -> https://example.com/shortlink
+            #
+            # - api_url=
+            
             # Pass the redirect method, if needed. TEMPORARY and PERMANENT
             # are accepted values, defaults to PERMANENT.
             # - redirect_method=TEMPORARY

resources/static/script.js

@@ -57,7 +57,7 @@ const refreshData = async () => {
         }
     } else {
         let data = await res.json();
-        displayData(data);
+        displayData(data.reverse());
         document.getElementById("api-key-button").hidden = false; // Show API Key button when logged in
     }
 }

resources/static/styles.css

@@ -3,7 +3,7 @@
 
 @font-face {
     font-family: Montserrat;
-    src: url('/assets/Montserrat-VF.woff2');
+    src: url('../assets/Montserrat-VF.woff2');
 }
 
 * {