From b985e8023a488e730f5cea34d0ce478e87331248 Mon Sep 17 00:00:00 2001 From: Bastian Gruber Date: Thu, 11 May 2023 21:18:01 +0200 Subject: [PATCH] chapter 2 --- 02-unique-id/Cargo.lock | 67 +++++++++++++++++++++++++++++++++++++++- 02-unique-id/Cargo.toml | 3 +- 02-unique-id/src/main.rs | 20 +++++++----- 3 files changed, 80 insertions(+), 10 deletions(-) diff --git a/02-unique-id/Cargo.lock b/02-unique-id/Cargo.lock index 0529ce7..70e486c 100644 --- a/02-unique-id/Cargo.lock +++ b/02-unique-id/Cargo.lock @@ -27,12 +27,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ch01-echo" +name = "ch02-unique-id" version = "0.1.0" dependencies = [ "serde", "serde_json", "tokio", + "uuid7", +] + +[[package]] +name = "fstr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a895bfe2e678995fb741d6d10408c6aedc97f1aa9ec2adcee70aa3680e4c661c" + +[[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi", ] [[package]] @@ -126,6 +144,12 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro2" version = "1.0.56" @@ -144,6 +168,36 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -268,6 +322,17 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +[[package]] +name = "uuid7" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233c7c9ee8049145cc83112419ba2bada98784672ca31ce4cf49e7360397277e" +dependencies = [ + "fstr", + "rand", + "serde", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/02-unique-id/Cargo.toml b/02-unique-id/Cargo.toml index 451f469..c60d3b9 100644 --- a/02-unique-id/Cargo.toml +++ b/02-unique-id/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ch01-echo" +name = "ch02-unique-id" version = "0.1.0" edition = "2021" @@ -9,3 +9,4 @@ edition = "2021" tokio = {version = "1", features = ["full"]} serde = {version = "1", features = ["derive"] } serde_json = "1" +uuid7 = { version = "0.6.2", features = ["serde"] } \ No newline at end of file diff --git a/02-unique-id/src/main.rs b/02-unique-id/src/main.rs index 52b1765..0b643d3 100644 --- a/02-unique-id/src/main.rs +++ b/02-unique-id/src/main.rs @@ -1,5 +1,6 @@ use serde::{Deserialize, Serialize}; use std::io::{self, BufRead, Write}; +use uuid7::Uuid; #[derive(Serialize, Deserialize, Debug)] struct Message { @@ -19,13 +20,15 @@ enum Body { }, #[serde(rename = "init_ok")] InitOk { in_reply_to: u64 }, - #[serde(rename = "echo")] - Echo { msg_id: u64, echo: String }, - #[serde(rename = "echo_ok")] - EchoOk { + #[serde(rename = "generate")] + Generate { + msg_id: u64, + }, + #[serde(rename = "generate_ok")] + GenerateOk { msg_id: u64, in_reply_to: u64, - echo: String, + id: Uuid, }, #[serde(rename = "error")] Error { @@ -60,14 +63,15 @@ fn main() { writeln!(stdout, "{}", output_json).unwrap(); stdout.flush().unwrap(); } - Body::Echo { msg_id, echo } => { + Body::Generate { msg_id, .. } => { + let uuid = uuid7::uuid7(); let output = Message { src: node_id.clone(), dest: input.src, - body: Body::EchoOk { + body: Body::GenerateOk { msg_id, in_reply_to: msg_id, - echo, + id: uuid, }, }; let output_json = serde_json::to_string(&output).unwrap();