feat: 添加 InnerCtx

Cargo.toml

@@ -28,7 +28,7 @@ ultimate-web = { version = "0.1", path = "ultimates/ultimate-web" }
 # begin -- memory allocator
 tikv-jemallocator = "0.6"
 # end   -- memory allocator
-derive_more = { version = "1.0", features = ["from", "display", "constructor"] }
+derive_more = { version = "1.0", features = ["from", "display"] }
 toml = "0.8"
 config = { version = "0.14", default-features = false, features = [
     "toml",

examples/api-example/Cargo.toml

@@ -34,6 +34,7 @@ sea-query.workspace = true
 sea-query-binder.workspace = true
 modql.workspace = true
 enum-iterator.workspace = true
+derive-new = "0.6"
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator.workspace = true

examples/api-example/src/auth/auth_serv.rs

@@ -3,7 +3,7 @@ use axum::{
   extract::FromRequestParts,
   http::{request::Parts, StatusCode},
 };
-use derive_more::derive::Constructor;
+use derive_new::new;
 use ultimate::{security::pwd::verify_pwd, Result};
 use ultimate_web::AppError;
 
@@ -15,14 +15,14 @@ use crate::{
 
 use super::{LoginByPwdReq, LoginResp, TokenType};
 
-#[derive(Constructor)]
+#[derive(new)]
 pub struct AuthServ {
   app: AppState,
 }
 
 impl AuthServ {
   pub async fn login_by_pwd(&self, req: LoginByPwdReq) -> Result<LoginResp> {
-    let user_serv = UserServ::new(self.app.clone(), self.app.create_super_admin_ctx());
+    let user_serv = UserServ::new(self.app.create_super_admin_ctx());
 
     let (u, uc) = user_serv.get_fetch_credential(UserFilter::from(&req)).await?;
     verify_pwd(&req.pwd, &uc.encrypted_pwd).await?;

examples/api-example/src/user/user_serv.rs

@@ -4,7 +4,7 @@ use axum::{
   http::{request::Parts, StatusCode},
   Json,
 };
-use derive_more::derive::Constructor;
+use derive_new::new;
 use ultimate::{DataError, Result};
 use ultimate_web::AppError;
 
@@ -14,7 +14,7 @@ use super::{
   User, UserBmc, UserCredential, UserCredentialBmc, UserFilter, UserForCreate, UserForPage, UserForUpdate, UserPage,
 };
 
-#[derive(Constructor)]
+#[derive(new)]
 pub struct UserServ {
   ctx: CtxW,
 }

ultimates/ultimate-web/src/util.rs

@@ -33,7 +33,7 @@ pub fn ok_ulid(id: Ulid) -> AppResult<IdUlidResult> {
 
 #[inline]
 #[cfg(feature = "uuid")]
-pub fn ok_uuid(id: uuid::Uuid) -> AppResult<IdI64Result> {
+pub fn ok_uuid(id: uuid::Uuid) -> AppResult<ultimate::IdUuidResult> {
   Ok(ultimate::IdUuidResult::new(id).into())
 }
 

ultimates/ultimate/src/ctx.rs

@@ -1,13 +1,13 @@
+use std::{ops::Deref, sync::Arc};
+
 use josekit::jwt::JwtPayload;
 
 use ultimate_common::time::{self, DateTime, Duration, Utc, UtcDateTime};
 
 use crate::DataError;
 
-/// 会话上下文。
-/// 此处 clone 的成本很低，若后续数据多的话可以使用 Arc 加 Wrapper 模式来降低数据复制的成本
-#[derive(Clone, Debug, Default)]
-pub struct Ctx {
+#[derive(Debug, Default)]
+pub struct InnerCtx {
   /// 会话用户 ID
   uid: i64,
 
@@ -27,9 +27,14 @@ pub struct Ctx {
   ext_privileges: Vec<i64>,
 }
 
+/// 会话上下文。
+/// 此处 clone 的成本很低，若后续数据多的话可以使用 Arc 加 Wrapper 模式来降低数据复制的成本
+#[derive(Clone, Debug, Default)]
+pub struct Ctx(Arc<InnerCtx>);
+
 impl Ctx {
   pub fn new(uid: i64, req_time: UtcDateTime, expires_at: UtcDateTime) -> Self {
-    Self { uid, req_time, expires_at, ..Default::default() }
+    Self(Arc::new(InnerCtx { uid, req_time, expires_at, ..Default::default() }))
   }
 
   pub fn new_root() -> Self {
@@ -52,37 +57,41 @@ impl Ctx {
     &self.req_time
   }
 
-  pub fn with_expires_at(mut self, expires_at: UtcDateTime) -> Self {
-    self.expires_at = expires_at;
-    self
+  pub fn expires_at(&self) -> &UtcDateTime {
+    &self.expires_at
   }
 
+  // pub fn with_expires_at(mut self, expires_at: UtcDateTime) -> Self {
+  //   self.expires_at = expires_at;
+  //   self
+  // }
+
   pub fn ext_orgs(&self) -> &[i64] {
     &self.ext_orgs
   }
 
-  pub fn with_ext_orgs(mut self, ext_orgs: Vec<i64>) -> Self {
-    self.ext_orgs = ext_orgs;
-    self
-  }
+  // pub fn with_ext_orgs(mut self, ext_orgs: Vec<i64>) -> Self {
+  //   self.ext_orgs = ext_orgs;
+  //   self
+  // }
 
   pub fn ext_roles(&self) -> &[i64] {
     &self.ext_roles
   }
 
-  pub fn with_ext_roles(mut self, ext_roles: Vec<i64>) -> Self {
-    self.ext_roles = ext_roles;
-    self
-  }
+  // pub fn with_ext_roles(mut self, ext_roles: Vec<i64>) -> Self {
+  //   self.0.ext_roles = ext_roles;
+  //   self
+  // }
 
   pub fn ext_privileges(&self) -> &[i64] {
     &self.ext_privileges
   }
 
-  pub fn with_ext_privileges(mut self, ext_privileges: Vec<i64>) -> Self {
-    self.ext_privileges = ext_privileges;
-    self
-  }
+  // pub fn with_ext_privileges(mut self, ext_privileges: Vec<i64>) -> Self {
+  //   self.ext_privileges = ext_privileges;
+  //   self
+  // }
 
   pub fn try_from_jwt_payload(payload: &JwtPayload, req_time: Option<UtcDateTime>) -> Result<Self, DataError> {
     let req_time = req_time.unwrap_or_else(time::now_utc);
@@ -105,6 +114,20 @@ impl Ctx {
   }
 }
 
+impl Deref for Ctx {
+  type Target = InnerCtx;
+
+  fn deref(&self) -> &Self::Target {
+    &self.0
+  }
+}
+
+// impl DerefMut for Ctx {
+//   fn deref_mut(&mut self) -> &mut Self::Target {
+//     &mut self.0
+//   }
+// }
+
 impl TryFrom<JwtPayload> for Ctx {
   type Error = DataError;