From fb44ee770572af3cfb524705bdb84b44a7ab1ad9 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Thu, 20 Mar 2025 12:00:12 +0100 Subject: [PATCH] Implement Object, Actor traits for Either --- Cargo.toml | 1 + src/traits/either.rs | 116 +++++++++++++++++++++++++++++++ src/{traits.rs => traits/mod.rs} | 3 + 3 files changed, 120 insertions(+) create mode 100644 src/traits/either.rs rename src/{traits.rs => traits/mod.rs} (99%) diff --git a/Cargo.toml b/Cargo.toml index e87011f..6fd6a84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,6 +81,7 @@ diesel = { version = "2.2.1", features = [ ], default-features = false, optional = true } futures = "0.3.30" moka = { version = "0.12.8", features = ["future"] } +either = "1.15.0" # Actix-web actix-web = { version = "4.8.0", default-features = false, optional = true } diff --git a/src/traits/either.rs b/src/traits/either.rs new file mode 100644 index 0000000..63a6ba4 --- /dev/null +++ b/src/traits/either.rs @@ -0,0 +1,116 @@ +use crate::{config::Data, error::Error}; +use async_trait::async_trait; +use chrono::{DateTime, Utc}; +use either::Either; +use url::Url; + +use super::{Actor, Object}; + +#[async_trait] +impl Object for Either +where + T: Object + Object + Send, + R: Object + Object + Send, + ::Kind: Send + Sync, + ::Kind: Send + Sync, + D: Sync + Send + Clone, + E: From, +{ + type DataType = D; + type Kind = Either; + type Error = E; + + fn last_refreshed_at(&self) -> Option> { + match self { + Either::Left(l) => l.last_refreshed_at(), + Either::Right(r) => r.last_refreshed_at(), + } + } + + async fn read_from_id( + object_id: Url, + data: &Data, + ) -> Result, Self::Error> { + let l = T::read_from_id(object_id.clone(), data).await?; + if let Some(l) = l { + return Ok(Some(Either::Left(l))); + } + let r = R::read_from_id(object_id.clone(), data).await?; + if let Some(r) = r { + return Ok(Some(Either::Right(r))); + } + Err(Error::NotFound.into()) + } + + async fn delete(self, data: &Data) -> Result<(), Self::Error> { + match self { + Either::Left(l) => l.delete(data).await, + Either::Right(r) => r.delete(data).await, + } + } + + async fn into_json(self, data: &Data) -> Result { + Ok(match self { + Either::Left(l) => Either::Left(l.into_json(data).await?), + Either::Right(r) => Either::Right(r.into_json(data).await?), + }) + } + + async fn verify( + json: &Self::Kind, + expected_domain: &Url, + data: &Data, + ) -> Result<(), Self::Error> { + match json { + Either::Left(l) => T::verify(l, expected_domain, data).await?, + Either::Right(r) => R::verify(r, expected_domain, data).await?, + }; + Ok(()) + } + + async fn from_json(json: Self::Kind, data: &Data) -> Result { + Ok(match json { + Either::Left(l) => Either::Left(T::from_json(l, data).await?), + Either::Right(r) => Either::Right(R::from_json(r, data).await?), + }) + } +} + +#[async_trait] +impl Actor for Either +where + T: Actor + Object + Object + Send + 'static, + R: Actor + Object + Object + Send + 'static, + ::Kind: Send + Sync, + ::Kind: Send + Sync, + D: Sync + Send + Clone, + E: From, +{ + fn id(&self) -> Url { + match self { + Either::Left(l) => l.id(), + Either::Right(r) => r.id(), + } + } + + fn public_key_pem(&self) -> &str { + match self { + Either::Left(l) => l.public_key_pem(), + Either::Right(r) => r.public_key_pem(), + } + } + + fn private_key_pem(&self) -> Option { + match self { + Either::Left(l) => l.private_key_pem(), + Either::Right(r) => r.private_key_pem(), + } + } + + fn inbox(&self) -> Url { + match self { + Either::Left(l) => l.inbox(), + Either::Right(r) => r.inbox(), + } + } +} diff --git a/src/traits.rs b/src/traits/mod.rs similarity index 99% rename from src/traits.rs rename to src/traits/mod.rs index 9976bda..6d7d043 100644 --- a/src/traits.rs +++ b/src/traits/mod.rs @@ -7,6 +7,9 @@ use serde::Deserialize; use std::{fmt::Debug, ops::Deref}; use url::Url; +/// `Either` implementations for traits +pub mod either; + /// Helper for converting between database structs and federated protocol structs. /// /// ```