From dd024ec8fb756067e2c6e850a6e862bf2bb7cf54 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 24 Sep 2023 21:57:24 +0200 Subject: [PATCH] feat: with complete example and generated code Signed-off-by: kjuulh --- Cargo.lock | 1 + crates/crunch-codegen/src/lib.rs | 17 +++--- crates/crunch-traits/Cargo.toml | 1 + crates/crunch-traits/src/errors.rs | 4 +- crates/crunch-traits/src/lib.rs | 2 +- crates/crunch/src/impls.rs | 18 +++--- crates/crunch/src/subscriber.rs | 2 +- examples/basic-setup/crunch.toml | 2 +- examples/basic-setup/src/crunch/mod.rs | 58 ------------------ .../basic.includes.my_include.rs | 0 .../{crunch => gencrunch}/basic.my_event.rs | 0 examples/basic-setup/src/gencrunch/mod.rs | 60 +++++++++++++++++++ examples/basic-setup/src/main.rs | 55 ++++++----------- 13 files changed, 106 insertions(+), 114 deletions(-) delete mode 100644 examples/basic-setup/src/crunch/mod.rs rename examples/basic-setup/src/{crunch => gencrunch}/basic.includes.my_include.rs (100%) rename examples/basic-setup/src/{crunch => gencrunch}/basic.my_event.rs (100%) create mode 100644 examples/basic-setup/src/gencrunch/mod.rs diff --git a/Cargo.lock b/Cargo.lock index ac6c105..ca0586d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -635,6 +635,7 @@ dependencies = [ "anyhow", "async-trait", "futures", + "prost 0.12.1", "thiserror", "tokio", "uuid", diff --git a/crates/crunch-codegen/src/lib.rs b/crates/crunch-codegen/src/lib.rs index dd8bdd2..a7d8fb5 100644 --- a/crates/crunch-codegen/src/lib.rs +++ b/crates/crunch-codegen/src/lib.rs @@ -64,28 +64,28 @@ impl Node { let padding = " ".repeat(indent * 4); let mut message_tokens = Vec::new(); - if let Some(file) = &self.file { if let Some(messages) = &self.messages { for message in messages.iter() { let tokens: genco::lang::rust::Tokens = quote! { - $['\r']$(&padding)impl ::crunch::Serializer for $(message) { + $['\r']$(&padding)impl ::crunch::traits::Serializer for $(message) { $['\r']$(&padding) fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { - $['\r']$(&padding) todo!() + $['\r']$(&padding) Ok(self.encode_to_vec()) $['\r']$(&padding) } $['\r']$(&padding)} - $['\r']$(&padding)impl ::crunch::Deserializer for $(message) { - $['\r']$(&padding) fn deserialize(_raw: Vec) -> Result + $['\r']$(&padding)impl ::crunch::traits::Deserializer for $(message) { + $['\r']$(&padding) fn deserialize(raw: Vec) -> Result $['\r']$(&padding) where $['\r']$(&padding) Self: Sized, $['\r']$(&padding) { - $['\r']$(&padding) todo!() + $['\r']$(&padding) let output = Self::decode(raw.as_slice()).map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; + $['\r']$(&padding) Ok(output) $['\r']$(&padding) } $['\r']$(&padding)} $['\r']$(&padding) - $['\r']$(&padding)impl Event for $(message) { + $['\r']$(&padding)impl crunch::traits::Event for $(message) { $['\r']$(&padding) fn event_info() -> ::crunch::traits::EventInfo { - $['\r']$(&padding) EventInfo { + $['\r']$(&padding) ::crunch::traits::EventInfo { $['\r']$(&padding) domain: "my-domain", $['\r']$(&padding) entity_type: "my-entity-type", $['\r']$(&padding) event_name: "my-event-name", @@ -100,6 +100,7 @@ impl Node { quote! { $['\r']$(&padding)pub mod $(&self.segment) { + use prost::Message; $['\r']$(&padding)include!($(quoted(file))); $['\r']$(&padding)$(for tokens in message_tokens join ($['\r']) => $tokens) $['\r']$(&padding)} diff --git a/crates/crunch-traits/Cargo.toml b/crates/crunch-traits/Cargo.toml index 46e32f3..85b0ac2 100644 --- a/crates/crunch-traits/Cargo.toml +++ b/crates/crunch-traits/Cargo.toml @@ -12,3 +12,4 @@ thiserror.workspace = true async-trait.workspace = true uuid.workspace = true futures.workspace = true +prost.workspace = true diff --git a/crates/crunch-traits/src/errors.rs b/crates/crunch-traits/src/errors.rs index d131b68..0ebe494 100644 --- a/crates/crunch-traits/src/errors.rs +++ b/crates/crunch-traits/src/errors.rs @@ -8,8 +8,10 @@ pub enum SerializeError { #[derive(Error, Debug)] pub enum DeserializeError { - #[error("failed to serialize {0}")] + #[error("failed to deserialize {0}")] FailedToDeserialize(anyhow::Error), + #[error("failed to deserialize {0}")] + ProtoErr(prost::DecodeError), } #[derive(Error, Debug)] diff --git a/crates/crunch-traits/src/lib.rs b/crates/crunch-traits/src/lib.rs index 92771d7..8615a3e 100644 --- a/crates/crunch-traits/src/lib.rs +++ b/crates/crunch-traits/src/lib.rs @@ -1,4 +1,4 @@ -use std::{fmt::Display}; +use std::fmt::Display; use async_trait::async_trait; use errors::{DeserializeError, PersistenceError, SerializeError}; diff --git a/crates/crunch/src/impls.rs b/crates/crunch/src/impls.rs index 81c78bd..3c02ecf 100644 --- a/crates/crunch/src/impls.rs +++ b/crates/crunch/src/impls.rs @@ -56,13 +56,17 @@ impl crunch_traits::Persistence for InMemoryPersistence { } async fn get(&self, event_id: &str) -> Result)>, PersistenceError> { - Ok(self - .store - .read() - .await - .get(event_id) - .filter(|m| m.state == MsgState::Pending).cloned() - .map(|m| (m.info, m.msg))) + let store = self.store.read().await; + + let event = match store.get(event_id).filter(|m| m.state == MsgState::Pending) { + Some(event) => event, + None => return Ok(None), + }; + + let (content, _) = crunch_envelope::proto::unwrap(event.msg.as_slice()) + .map_err(|e| PersistenceError::GetErr(anyhow::anyhow!(e)))?; + + Ok(Some((event.info, content))) } async fn update_published(&self, event_id: &str) -> Result<(), PersistenceError> { diff --git a/crates/crunch/src/subscriber.rs b/crates/crunch/src/subscriber.rs index 181811e..a3b5e63 100644 --- a/crates/crunch/src/subscriber.rs +++ b/crates/crunch/src/subscriber.rs @@ -1,4 +1,4 @@ -use crunch_traits::{Event}; +use crunch_traits::Event; use futures::StreamExt; use crate::{errors, Transport}; diff --git a/examples/basic-setup/crunch.toml b/examples/basic-setup/crunch.toml index acf21b1..eb8cf3d 100644 --- a/examples/basic-setup/crunch.toml +++ b/examples/basic-setup/crunch.toml @@ -5,4 +5,4 @@ codegen = ["rust"] [[publish]] schema-path = "schemas/crunch" -output-path = "src/crunch" +output-path = "src/gencrunch" diff --git a/examples/basic-setup/src/crunch/mod.rs b/examples/basic-setup/src/crunch/mod.rs deleted file mode 100644 index 0cc8044..0000000 --- a/examples/basic-setup/src/crunch/mod.rs +++ /dev/null @@ -1,58 +0,0 @@ -pub mod basic { - pub mod my_event { - include!("basic.my_event.rs"); - - impl ::crunch::Serializer for MyEvent { - fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { - todo!() - } - } - impl ::crunch::Deserializer for MyEvent { - fn deserialize(_raw: Vec) -> Result - where - Self: Sized, - { - todo!() - } - } - - impl Event for MyEvent { - fn event_info() -> ::crunch::traits::EventInfo { - EventInfo { - domain: "my-domain", - entity_type: "my-entity-type", - event_name: "my-event-name", - } - } - } - } - pub mod includes { - pub mod my_include { - include!("basic.includes.my_include.rs"); - - impl ::crunch::Serializer for MyInclude { - fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { - todo!() - } - } - impl ::crunch::Deserializer for MyInclude { - fn deserialize(_raw: Vec) -> Result - where - Self: Sized, - { - todo!() - } - } - - impl Event for MyInclude { - fn event_info() -> ::crunch::traits::EventInfo { - EventInfo { - domain: "my-domain", - entity_type: "my-entity-type", - event_name: "my-event-name", - } - } - } - } - } -} diff --git a/examples/basic-setup/src/crunch/basic.includes.my_include.rs b/examples/basic-setup/src/gencrunch/basic.includes.my_include.rs similarity index 100% rename from examples/basic-setup/src/crunch/basic.includes.my_include.rs rename to examples/basic-setup/src/gencrunch/basic.includes.my_include.rs diff --git a/examples/basic-setup/src/crunch/basic.my_event.rs b/examples/basic-setup/src/gencrunch/basic.my_event.rs similarity index 100% rename from examples/basic-setup/src/crunch/basic.my_event.rs rename to examples/basic-setup/src/gencrunch/basic.my_event.rs diff --git a/examples/basic-setup/src/gencrunch/mod.rs b/examples/basic-setup/src/gencrunch/mod.rs new file mode 100644 index 0000000..753a440 --- /dev/null +++ b/examples/basic-setup/src/gencrunch/mod.rs @@ -0,0 +1,60 @@ +pub mod basic { + pub mod includes { + pub mod my_include { use prost::Message; + include!("basic.includes.my_include.rs"); + + impl ::crunch::traits::Serializer for MyInclude { + fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { + Ok(self.encode_to_vec()) + } + } + impl ::crunch::traits::Deserializer for MyInclude { + fn deserialize(raw: Vec) -> Result + where + Self: Sized, + { + let output = Self::decode(raw.as_slice()).map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; + Ok(output) + } + } + + impl crunch::traits::Event for MyInclude { + fn event_info() -> ::crunch::traits::EventInfo { + ::crunch::traits::EventInfo { + domain: "my-domain", + entity_type: "my-entity-type", + event_name: "my-event-name", + } + } + } + } + } + pub mod my_event { use prost::Message; + include!("basic.my_event.rs"); + + impl ::crunch::traits::Serializer for MyEvent { + fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { + Ok(self.encode_to_vec()) + } + } + impl ::crunch::traits::Deserializer for MyEvent { + fn deserialize(raw: Vec) -> Result + where + Self: Sized, + { + let output = Self::decode(raw.as_slice()).map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; + Ok(output) + } + } + + impl crunch::traits::Event for MyEvent { + fn event_info() -> ::crunch::traits::EventInfo { + ::crunch::traits::EventInfo { + domain: "my-domain", + entity_type: "my-entity-type", + event_name: "my-event-name", + } + } + } + } +} diff --git a/examples/basic-setup/src/main.rs b/examples/basic-setup/src/main.rs index 1d02262..662b6f1 100644 --- a/examples/basic-setup/src/main.rs +++ b/examples/basic-setup/src/main.rs @@ -1,49 +1,30 @@ -mod crunch; +mod gencrunch; -use ::crunch::traits::{Deserializer, Event, EventInfo, Serializer}; - -struct MyEvent {} - -impl Serializer for MyEvent { - fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { - todo!() - } -} -impl Deserializer for MyEvent { - fn deserialize(_raw: Vec) -> Result - where - Self: Sized, - { - todo!() - } -} - -impl Event for MyEvent { - fn event_info() -> ::crunch::traits::EventInfo { - EventInfo { - domain: "my-domain", - entity_type: "my-entity-type", - event_name: "my-event-name", - } - } -} +use gencrunch::basic::{includes::my_include::MyInclude, my_event::MyEvent}; #[tokio::main] async fn main() -> anyhow::Result<()> { - crunch::basic::my_event::MyEvent { - name: "some-name".into(), - include: Some(crunch::basic::includes::my_include::MyInclude { - name: "some-name".into(), - }), - }; - let crunch = ::crunch::builder::Builder::default().build()?; crunch - .subscribe(|_item: MyEvent| async move { Ok(()) }) + .subscribe(|item: MyEvent| async move { + println!("received item: {:?}", item); + + Ok(()) + }) .await?; - crunch.publish(MyEvent {}).await?; + crunch + .publish(MyEvent { + name: "some-name".into(), + include: Some(MyInclude { + name: "some-name".into(), + }), + }) + .await?; + + // Sleep a while to let subscriber catch item + tokio::time::sleep(std::time::Duration::from_secs(1)).await; Ok(()) }