Make Id generation part of its implementation

Author: matze

src/handlers/insert/api.rs

@@ -1,9 +1,8 @@
 use crate::db::{Database, write};
-use crate::errors::{Error, JsonErrorResponse};
+use crate::errors::JsonErrorResponse;
 use crate::id::Id;
 use axum::Json;
 use axum::extract::State;
-use rand::Rng;
 use serde::{Deserialize, Serialize};
 use std::num::NonZeroU32;
 
@@ -40,11 +39,7 @@ pub async fn post(
     State(db): State<Database>,
     Json(entry): Json<Entry>,
 ) -> Result<Json<RedirectResponse>, JsonErrorResponse> {
-    let id: Id = tokio::task::spawn_blocking(|| rand::rng().random::<u32>())
-        .await
-        .map_err(Error::from)?
-        .into();
-
+    let id = Id::new();
     let entry: write::Entry = entry.into();
     let path = format!("/{}", id.to_url_path(&entry));
     db.insert(id, entry).await?;

src/handlers/insert/form.rs

@@ -1,13 +1,12 @@
+use crate::Page;
 use crate::db::{Database, write};
 use crate::handlers::extract::{Theme, Uid};
 use crate::handlers::html::make_error;
 use crate::id::Id;
-use crate::{Error, Page};
 use axum::extract::{Form, State};
 use axum::http::HeaderMap;
 use axum::response::{IntoResponse, Redirect};
 use axum_extra::extract::cookie::{Cookie, SameSite, SignedCookieJar};
-use rand::Rng;
 use serde::{Deserialize, Serialize};
 use std::num::NonZeroU32;
 
@@ -66,11 +65,6 @@ pub async fn post(
         .unwrap_or(false);
 
     async {
-        let id: Id = tokio::task::spawn_blocking(|| rand::rng().random::<u32>())
-            .await
-            .map_err(Error::from)?
-            .into();
-
         // Use cookie uid or generate a new one.
         let uid = if let Some(Uid(uid)) = uid {
             uid
@@ -81,6 +75,7 @@ pub async fn post(
         let mut entry: write::Entry = entry.into();
         entry.uid = Some(uid);
 
+        let id = Id::new();
         let mut url = id.to_url_path(&entry);
 
         if entry.burn_after_reading.unwrap_or(false) {

src/id.rs

@@ -1,5 +1,6 @@
 use crate::db::write::Entry;
 use crate::errors::Error;
+use rand::Rng;
 use std::fmt;
 use std::str::FromStr;
 
@@ -17,6 +18,13 @@ pub(crate) struct Id {
 }
 
 impl Id {
+    /// Generate a new random [`Id`]. According to the [`rand::rng()`] documentation this should be
+    /// fast and not require additional an `spawn_blocking()` call.
+    pub fn new() -> Self {
+        let n = rand::rng().random::<u32>();
+        Self { n }
+    }
+
     /// Return i64 representation for database storage purposes.
     pub fn to_i64(self) -> i64 {
         self.n.into()