Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From blather-0.11.0 To blather-0.12.0
2025-06-10
| ||
22:53 | Dependencies. Leaf check-in: 57cb959ef2 user: jan tags: trunk | |
2025-05-18
| ||
21:58 | Experiment with CbErr instead of From<Error> for vec encoding/decoding. Leaf check-in: b4da21ab85 user: jan tags: cberr | |
2025-05-13
| ||
15:55 | Release maintenance. check-in: e2b1017969 user: jan tags: blather-0.12.0, trunk | |
15:48 | Document document generation. check-in: 48942b13bc user: jan tags: trunk | |
2025-05-01
| ||
11:20 | Merge. check-in: 4984cb9c5e user: jan tags: trunk | |
2025-04-30
| ||
20:36 | Redesign. check-in: 9f97f187cc user: jan tags: redesign | |
2024-09-22
| ||
14:26 | Release maintenance. check-in: f9ffae0254 user: jan tags: blather-0.11.0, trunk | |
12:02 | Docs. check-in: 69ffa6c624 user: jan tags: trunk | |
Changes to .efiles.
1 2 3 4 5 6 | Cargo.toml README.md www/index.md www/changelog.md src/err.rs src/lib.rs | | | < | | < < | 1 2 3 4 5 6 7 8 9 10 11 | Cargo.toml README.md www/index.md www/changelog.md src/err.rs src/lib.rs src/params.rs src/telegram.rs src/kvlines.rs src/validators.rs src/codec.rs |
Changes to Cargo.toml.
1 2 | [package] name = "blather" | | | > > > > > > > | | | < | > | > > | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | [package] name = "blather" version = "0.12.0" edition = "2024" rust-version = "1.85" license = "0BSD" # https://crates.io/category_slugs categories = [ "network-programming" ] keywords = [ "line-based", "protocol", "tokio", "codec" ] repository = "https://repos.qrnch.tech/pub/blather" description = "A talkative line-based protocol" exclude = [ ".fossil-settings", ".efiles", ".fslckout", "bacon.toml", "rustfmt.toml", "www" ] # https://doc.rust-lang.org/cargo/reference/manifest.html#the-badges-section [badges] maintenance = { status = "actively-developed" } [features] bin = ["dep:base85"] bincode = ["dep:bincode", "bin"] [dependencies] base85 = { version = "2.0.0", optional = true } bincode = { version = "2.0.1", optional = true } bytes = { version = "1.10.1" } futures = { version = "0.3.31" } tokio = { version = "1.45.0" } tokio-util = { version= "0.7.15", features = ["codec"] } [dev-dependencies] orphanage = { version = "0.2.4" } tokio = { version = "1.45.0", features = ["io-util", "macros", "net"] } tokio-stream = { version = "0.1.17" } tokio-test = { version = "0.4.4" } [package.metadata.docs.rs] all-features = true rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"] [lints.clippy] all = { level = "warn", priority = -1 } pedantic = { level = "warn", priority = -1 } nursery = { level = "warn", priority = -1 } cargo = { level = "warn", priority = -1 } # vim: set ft=toml et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Changes to rustfmt.toml.
1 2 | blank_lines_upper_bound = 2 comment_width = 79 | | | 1 2 3 4 5 6 7 8 9 10 | blank_lines_upper_bound = 2 comment_width = 79 edition = "2024" #force_multiline_blocks = true format_strings = true max_width = 79 match_block_trailing_comma = false tab_spaces = 2 trailing_comma = "Never" unstable_features = true |
︙ | ︙ |
Changes to src/codec.rs.
1 2 3 | //! A [`tokio_util::codec`] Codec that is used to encode and decode the //! blather protocol. | < < | | | > | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | //! A [`tokio_util::codec`] Codec that is used to encode and decode the //! blather protocol. use std::{ fmt, {cmp, collections::HashMap, mem} }; use bytes::{BufMut, Bytes, BytesMut}; use { tokio::{io, sync::mpsc::UnboundedSender}, tokio_util::codec::{Decoder, Encoder} }; use crate::{ err::Error, {KVLines, Params, Telegram} }; /// Current state of decoder. /// /// Controls what, if anything, will be returned to the application. #[derive(Clone, Debug, PartialEq, Eq)] enum CodecState { /// Read and decode a [`Telegram`] buffer from the network. Telegram, /// Read and decode a [`Params`] buffer from the network. Params, /// Read and decode an vector of key/value pairs. KVLines, /// Read a specified amount of raw bytes, and return it in chunks as they /// arrive. Chunks, /// Read a specified amount of raw bytes, and return the entire immutable /// buffer when it has arrived. Bytes, /// Transmit received bytes buffers to a channel. BytesCh, /// Ignore a specified amount of raw bytes. Skip } /// Data returned to the application when the Codec's Decode iterator is /// called and the decoder has a complete entity to return. |
︙ | ︙ | |||
61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | /// A chunk of raw data has arrived. The second argument is the amount of /// data remains, which has been adjusted for the current [`Bytes`]. If /// the `u64` parameter is 0 it means this is the final chunk. Chunk(Bytes, u64), /// A complete raw immutable buffer has been received. Bytes(Bytes), /// The requested number of bytes have been ignored. SkipDone } /// The Codec is used to keep track of the state of the inbound and outbound /// communication. pub struct Codec { next_line_index: usize, max_line_length: usize, tg: Telegram, params: Params, kvlines: KVLines, state: CodecState, | > > > > | > < | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | /// A chunk of raw data has arrived. The second argument is the amount of /// data remains, which has been adjusted for the current [`Bytes`]. If /// the `u64` parameter is 0 it means this is the final chunk. Chunk(Bytes, u64), /// A complete raw immutable buffer has been received. Bytes(Bytes), /// Sentinel value used to signal that transfer of buffers to a channel is /// done. BytesChDone, /// The requested number of bytes have been ignored. SkipDone } /// The Codec is used to keep track of the state of the inbound and outbound /// communication. pub struct Codec { next_line_index: usize, max_line_length: usize, tg: Telegram, params: Params, kvlines: KVLines, state: CodecState, remain: u64, bytes_tx: Option<UnboundedSender<Bytes>> } #[allow(clippy::missing_fields_in_debug)] impl fmt::Debug for Codec { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("Codec").field("state", &self.state).finish() } } impl Default for Codec { fn default() -> Self { Self::new() } } /// A Codec used to encode and decode the blather protocol. /// /// # Notes /// Normally the Codec object is hidden inside a /// [`Framed`](tokio_util::codec::Framed) object. In order to /// call methods in the codec it must be accessed through the Framed object: |
︙ | ︙ | |||
128 129 130 131 132 133 134 | Self { next_line_index: 0, max_line_length: usize::MAX, tg: Telegram::new_uninit(), params: Params::new(), kvlines: KVLines::new(), state: CodecState::Telegram, | | > < < | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | Self { next_line_index: 0, max_line_length: usize::MAX, tg: Telegram::new_uninit(), params: Params::new(), kvlines: KVLines::new(), state: CodecState::Telegram, remain: 0, bytes_tx: None } } /// Create a new `Codec` with a specific maximum line length. The default /// state will be to expect a [`Telegram`]. #[must_use] pub fn new_with_max_length(max_line_length: usize) -> Self { Self { max_line_length, ..Self::new() } } /// Get the current maximum line length. #[must_use] pub const fn max_line_length(&self) -> usize { self.max_line_length } /// Determine how far into the buffer we'll search for a newline. If /// there's no `max_length` set, we'll read to the end of the buffer. fn find_newline(&self, buf: &BytesMut) -> (usize, Option<usize>) { let read_to = cmp::min(self.max_line_length.saturating_add(1), buf.len()); let newline_offset = buf[self.next_line_index..read_to] .iter() .position(|b| *b == b'\n'); (read_to, newline_offset) } /// This is called when `decode_telegram_lines` has encountered an eol, /// determined that the string is longer than zero characters, and thus /// passed the line to this function to process it. /// /// The first line received is a telegram topic. This is a required line. /// Following lines are parameter lines, which are a single space character |
︙ | ︙ | |||
280 281 282 283 284 285 286 | // Returning Ok(None) instructs the FramedRead that more data is // needed. return Ok(None); } } } | < | 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | // Returning Ok(None) instructs the FramedRead that more data is // needed. return Ok(None); } } } /// Read buffer line-by-line, split each line at the first space character /// and store the left part as a key and the right part as a value in a /// Params structure. fn decode_params_lines( &mut self, buf: &mut BytesMut ) -> Result<Option<Params>, Error> { |
︙ | ︙ | |||
349 350 351 352 353 354 355 | // taken). return Ok(Some(mem::take(&mut self.kvlines))); } let idx = line.find(' '); if let Some(idx) = idx { let (k, v) = line.split_at(idx); let v = &v[1..v.len()]; | > | < | < | > > > > > > > > > > > > > > > > > > | | | | 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | // taken). return Ok(Some(mem::take(&mut self.kvlines))); } let idx = line.find(' '); if let Some(idx) = idx { let (k, v) = line.split_at(idx); let v = &v[1..v.len()]; self.kvlines.append(k, v)?; } } else { // Need more data return Ok(None); } } } /// Set the decoder to treat the next `size` bytes as raw bytes to be /// received in chunks as `Bytes`. /// /// # Decoder behavior /// The decoder will return an [`Input::Chunk(buf, remain)`](Input::Chunk) to /// the application each time a new chunk has been received. In addition to /// the actual chunk the number of bytes remaining will be returned. The /// remaining bytes value is adjusted to subtract the currently returned /// chunk, which means that the application can detect the end of the /// buffer by checking if the remaining value is zero. /// /// Once the entire buffer has been received by the `Decoder` it will revert /// to expect an [`Input::Telegram`]. /// /// # Errors /// [`Error::InvalidSize`] means the `size` parameter was set to `0`. pub fn expect_chunks(&mut self, size: u64) -> Result<(), Error> { if size == 0 { return Err(Error::InvalidSize("zero size".to_string())); } //println!("Expecting bin {}", size); self.state = CodecState::Chunks; self.remain = size; Ok(()) } /// Expect a immutable buffer of a certain size to be received. /// /// The returned buffer will be stored in process memory. /// /// # Decoder behavior /// Once a complete buffer has been successfully reaceived the `Decoder` will /// return an [`Input::Bytes(b)`](Input::Bytes) where `b` is a /// [`bytes::Bytes`] containing the entire buffer. /// /// Once the entire buffer has been received by the `Decoder` it will revert /// to expect an [`Input::Telegram`]. /// /// # Errors /// [`Error::InvalidSize`] means the `size` parameter was set to `0`. #[allow(clippy::missing_panics_doc)] pub fn expect_bytes(&mut self, size: usize) -> Result<(), Error> { if size == 0 { return Err(Error::InvalidSize("zero size".to_string())); } self.state = CodecState::Bytes; // unwrap() should be safe, unless running on a platform where // size_of::<usize>() > size_of::<u64>() and the buffer is larger than // usize::MAX. self.remain = size.try_into().unwrap(); Ok(()) } /// Expect specified amount of data which will be received as `Bytes` buffers /// and sent over a channel using a [`UnboundedSender`] end-point. /// /// # Errors /// [`Error::InvalidSize`] means the `size` parameter was set to `0`. pub fn expect_bytes_channel( &mut self, size: u64, tx: UnboundedSender<Bytes> ) -> Result<(), Error> { if size == 0 { return Err(Error::InvalidSize("must not be zero".to_string())); } self.state = CodecState::BytesCh; self.bytes_tx = Some(tx); self.remain = size; Ok(()) } /// Tell the Decoder to expect lines of key/value pairs. /// /// # Decoder behavior /// On successful completion the the decoder will next return an /// [`Input::Params(params)`](Input::Params) once a complete `Params` buffer /// has been received. /// /// Once the entire buffer has been received by the `Decoder` it will revert /// to expect an [`Input::Telegram`]. pub const fn expect_params(&mut self) { self.state = CodecState::Params; } /// Tell the Decoder to expect lines ordered key/value pairs. /// /// # Decoder behavior /// On successful completion the Framed `StreamExt::next()` will return an /// [`Input::KVLines(kvlines)`](Input::KVLines) once a complete `KVLines` /// buffer has been received. /// /// Once the entire buffer has been received by the `Decoder` it will revert /// to expect an [`Input::Telegram`]. pub const fn expect_kvlines(&mut self) { self.state = CodecState::KVLines; } /// Skip a requested number of bytes. /// /// # Decoder behavior /// On successful completion the decoder will have ignored the specified /// number of byes, reverts back to waiting for a [`Input::Telegram`] and /// returns [`Input::SkipDone`]. /// /// # Errors /// [`Error::InvalidSize`] means the `size` parameter was set to `0`. pub fn skip(&mut self, size: u64) -> Result<(), Error> { if size == 0 { return Err(Error::InvalidSize("zero size".to_string())); } self.state = CodecState::Skip; self.remain = size; Ok(()) } } |
︙ | ︙ | |||
566 567 568 569 570 571 572 573 574 575 576 577 578 579 | Ok(None) } else { // Revert to expecting Telegram lines self.state = CodecState::Telegram; Ok(Some(Input::Bytes(buf.split_to(remain).freeze()))) } } CodecState::Skip => { if buf.is_empty() { return Ok(None); // Need more data } // Read as much data as available or requested and write it to our | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 | Ok(None) } else { // Revert to expecting Telegram lines self.state = CodecState::Telegram; Ok(Some(Input::Bytes(buf.split_to(remain).freeze()))) } } CodecState::BytesCh => { // Calculate how much data to take off read buffer, capping at // `remain`. let read_to = cmp::min(self.remain, buf.len() as u64); self.remain -= read_to; // Return a buffer and the amount of data remaining, this buffer // included. The application can check if remain is 0 to determine // if it has received all the expected binary data. // // .unwrap() is safe here, because read_to is guaranteed to // be within the bounds of an usize due to the `cmp::min()` above. let len = usize::try_from(read_to).unwrap(); let buf = buf.split_to(len).freeze(); if let Some(ref tx) = self.bytes_tx { // Ignore errors -- we'll assume this means the application dropped // the reader end-point to signal it is no longer interested in // receiving the data. let _ = tx.send(buf); } // If we have all the expected data, then report that we're done with a // senitnel value. Otherwise report back to caller that more data is // needed. if self.remain == 0 { // When no more data is expected for this binary part, revert to // expecting a Telegram self.state = CodecState::Telegram; // Send an empty buffer to signal eof, then drop the end-point if let Some(tx) = self.bytes_tx.take() { let _ = tx.send(Bytes::new()); } // Return sentinel value just to signal that we're done Ok(Some(Input::BytesChDone)) } else { Ok(None) } } CodecState::Skip => { if buf.is_empty() { return Ok(None); // Need more data } // Read as much data as available or requested and write it to our |
︙ | ︙ | |||
700 701 702 703 704 705 706 707 | ) -> Result<(), crate::err::Error> { buf.reserve(data.len()); buf.put(data); Ok(()) } } // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 | ) -> Result<(), crate::err::Error> { buf.reserve(data.len()); buf.put(data); Ok(()) } } #[cfg(test)] mod tests { use { futures::sink::SinkExt, tokio::sync::mpsc::unbounded_channel, tokio_stream::StreamExt, tokio_test::io::Builder, tokio_util::codec::Framed }; use bytes::BytesMut; use super::{Bytes, Codec, Input, Telegram}; #[tokio::test] async fn valid_no_params() { let mut mock = Builder::new(); mock.read(b"hello\n\n"); let mut frm = Framed::new(mock.build(), Codec::new()); while let Some(o) = frm.next().await { let o = o.unwrap(); if let Input::Telegram(tg) = o { assert_eq!(tg.get_topic(), "hello"); let params = tg.into_params(); let map = params.into_inner(); assert_eq!(map.len(), 0); } else { panic!("Not a Telegram"); } } } #[tokio::test] async fn valid_with_params() { let mut mock = Builder::new(); mock.read(b"hello\nmurky_waters off\nwrong_impression cows\n\n"); let mut frm = Framed::new(mock.build(), Codec::new()); while let Some(o) = frm.next().await { let o = o.unwrap(); match o { Input::Telegram(tg) => { assert_eq!(tg.get_topic(), "hello"); let params = tg.into_params(); let map = params.into_inner(); assert_eq!(map.len(), 2); assert_eq!(map.get("murky_waters").unwrap(), "off"); assert_eq!(map.get("wrong_impression").unwrap(), "cows"); } _ => { panic!("Not a Telegram"); } } } } #[tokio::test] #[should_panic( expected = "Protocol(\"Bad format; Invalid topic character\")" )] async fn bad_topic() { let mut mock = Builder::new(); // space isn't allowed in topic mock.read(b"hel lo\n\n"); let mut frm = Framed::new(mock.build(), Codec::new()); let e = frm.next().await.unwrap(); e.unwrap(); } #[tokio::test] async fn multiple() { let mut mock = Builder::new(); mock.read(b"hello\nfoo bar\n\nworld\nholy cows\n\nfinal\nthe thing\n\n"); let mut frm = Framed::new(mock.build(), Codec::new()); let o = frm.next().await.unwrap().unwrap(); let Input::Telegram(tg) = o else { panic!("Unexpectely not Input::Telegram"); }; assert_eq!(tg.get_topic(), "hello"); assert_eq!(tg.get_str("foo"), Some("bar")); let o = frm.next().await.unwrap().unwrap(); let Input::Telegram(tg) = o else { panic!("Unexpectely not Input::Telegram"); }; assert_eq!(tg.get_topic(), "world"); assert_eq!(tg.get_str("holy"), Some("cows")); let o = frm.next().await.unwrap().unwrap(); let Input::Telegram(tg) = o else { panic!("Unexpectely not Input::Telegram"); }; assert_eq!(tg.get_topic(), "final"); assert_eq!(tg.get_str("the"), Some("thing")); } #[tokio::test] async fn tg_followed_by_buf() { let mut mock = Builder::new(); mock.read(b"hello\nlen 4\n\n1234"); let mut frm = Framed::new(mock.build(), Codec::new()); let Some(o) = frm.next().await else { panic!("No frame"); }; let o = o.unwrap(); if let Input::Telegram(tg) = o { assert_eq!(tg.get_topic(), "hello"); assert_eq!(tg.get_fromstr::<usize, _>("len").unwrap().unwrap(), 4); frm.codec_mut().expect_bytes(4).unwrap(); } else { panic!("Not a Telegram"); } while let Some(o) = frm.next().await { let o = o.unwrap(); if let Input::Bytes(_bm) = o { } else { panic!("Not a Buf"); } } } #[tokio::test] async fn tg_buf_tg() { let mut mock = Builder::new(); mock.read(b"hello\nlen 4\n\n1234world\nfoo bar\n\n"); let mut frm = Framed::new(mock.build(), Codec::new()); // Expect Telegram, which sets up for getting Bytes let o = frm.next().await.unwrap().unwrap(); let Input::Telegram(tg) = o else { panic!("Unexpectedly not Input::Telegram(_)"); }; assert_eq!(tg.get_topic(), "hello"); let len = tg.get_fromstr::<usize, _>("len").unwrap().unwrap(); assert_eq!(len, 4); frm.codec_mut().expect_bytes(len).unwrap(); // Expect Bytes let o = frm.next().await.unwrap().unwrap(); let Input::Bytes(buf) = o else { panic!("Unexpectedly not Input::Bytes(_)"); }; assert_eq!(buf, "1234"); // Expect Telegram let o = frm.next().await.unwrap().unwrap(); let Input::Telegram(tg) = o else { panic!("Unexpectedly not Input::Telegram(_)"); }; assert_eq!(tg.get_topic(), "world"); assert_eq!(tg.get_str("foo"), Some("bar")); } #[tokio::test] async fn expect_bytes_ch() { let (client, server) = tokio::io::duplex(64); let mut frmin = Framed::new(server, Codec::new()); let mut frmout = Framed::new(client, Codec::new()); // Spawn server task let jh = tokio::task::spawn(async move { let o = frmin.next().await.unwrap().unwrap(); let Input::Telegram(tg) = o else { panic!("Unexpectedly not Input::Telegram(_)"); }; assert_eq!(tg.as_ref(), "ReqToSend"); let len = tg.get_fromstr::<u64, _>("Len").unwrap().unwrap(); // Create a channel for receiving stream of Bytes let (tx, mut rx) = unbounded_channel(); // Expect requested number of bytes frmin.codec_mut().expect_bytes_channel(len, tx).unwrap(); // Spawn task for receiving expected data through channel let jh = tokio::task::spawn(async move { let mut inbuf = BytesMut::new(); inbuf.reserve(16); // Receive the expected amount of bytes over channel loop { let buf = rx.recv().await.unwrap(); if buf.is_empty() { break; } // ToDo: Verify buffer contents inbuf.extend_from_slice(&buf); } let buf = inbuf.freeze(); assert_eq!(buf, "0123456789abcdef"); }); // Wait for codec to report that it is done feeding data to the channel let o = frmin.next().await.unwrap().unwrap(); let Input::BytesChDone = o else { panic!("Unexpectedly not Input::BytesChDone"); }; jh.await.unwrap(); }); let len = 16; let mut tg = Telegram::new("ReqToSend"); tg.add_param("Len", len).unwrap(); frmout.send(&tg).await.unwrap(); // Send `len` amount of binary data frmout.send(Bytes::from("0123")).await.unwrap(); frmout.send(Bytes::from("4567")).await.unwrap(); frmout.send(Bytes::from("89ab")).await.unwrap(); frmout.send(Bytes::from("cdef")).await.unwrap(); jh.await.unwrap(); } } // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Deleted src/codec/utils.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to src/err.rs.
1 2 3 4 5 6 7 8 9 10 11 12 | //! Error types and error management functions. use std::fmt; use tokio::io; /// Error that `blather` can emit. #[derive(Debug)] pub enum Error { /// The input format of a buffer was incorrect. BadFormat(String), | > > > > > > > > > > > < < < | | > > > > > > > > > > > < < < > > > | > > > > > > > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | //! Error types and error management functions. use std::fmt; use tokio::io; /// Specifies whether a parameter key or value is invalid. #[derive(Debug)] pub enum ParamError { /// The key is invalid. Key(String), /// The value is invalid. Value(String) } /// Error that `blather` can emit. #[derive(Debug)] pub enum Error { /// The input format of a buffer was incorrect. BadFormat(String), /// The specified size is invalid, or invalid in a specific context. InvalidSize(String), /// A `std::io` or `tokio::io` error has occurred. IO(std::io::Error), /// Invalid `Params` field. Param(ParamError), /// Unable to serialize a buffer. SerializeError(String), /// A "protcol error" implies that the Framed decoder detected an error /// while parsing incoming data. /// /// This can either mean that an unexpected format was detected while /// parsing the wire protocol, or that the `Codec` was found to be in an /// unepxcted state. Protocol(String) } impl Error { /// Factory for `Self::BadFormat`. pub fn bad_format(s: impl Into<String>) -> Self { Self::BadFormat(s.into()) } } impl std::error::Error for Error {} impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { Self::BadFormat(s) => write!(f, "Bad format; {s}"), Self::InvalidSize(s) => write!(f, "Invalid size; {s}"), Self::IO(e) => write!(f, "I/O error; {e}"), Self::Param(pe) => { if f.alternate() { match pe { ParamError::Key(s) => write!(f, "Invalid key; {s}"), ParamError::Value(s) => write!(f, "Invalid value; {s}") } } else { match pe { ParamError::Key(s) | ParamError::Value(s) => write!(f, "{s}") } } } Self::Protocol(s) => write!(f, "Protocol; {s}"), Self::SerializeError(s) => write!(f, "Unable to serialize; {s}") } } } impl From<io::Error> for Error { fn from(err: io::Error) -> Self { |
︙ | ︙ |
Added src/kvlines.rs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 | //! A key/value pair list with stable ordering and non-unique keys. use std::fmt; use bytes::{BufMut, BytesMut}; use crate::{ validators::{validate_param_key, validate_param_value}, Error }; /// Representation of a key/value pair in `KVLines`. #[derive(Debug, Clone, Default, PartialEq, Eq)] pub struct KeyValue { key: String, value: String } /// Ordered list of key/value pairs, with no uniqueness constraint for the /// keys. #[derive(Debug, Clone, Default)] pub struct KVLines { lines: Vec<KeyValue> } impl KVLines { /// Create a new empty parameters object. #[must_use] pub fn new() -> Self { Self::default() } /// Reset all the lines. pub fn clear(&mut self) { self.lines.clear(); } /// Get a reference to the inner vector of [`KeyValue`]'s. #[must_use] pub const fn get_inner(&self) -> &Vec<KeyValue> { &self.lines } /// Append a key/value entry to the end of the list. /// /// # Errors /// If either key or value contain invalid characters [`Error::Param`] is /// returned, with `ParamError::Key` or `ParamError::Value` indicating /// whether it's the key or the value that is invalid. #[allow(clippy::needless_pass_by_value)] pub fn append( &mut self, key: impl ToString, value: impl ToString ) -> Result<(), Error> { let key = key.to_string(); let value = value.to_string(); validate_param_key(&key)?; validate_param_value(&value)?; self.lines.push(KeyValue { key, value }); Ok(()) } /// Calculate the size of the buffer in serialized form. /// Each entry will be a newline terminated utf-8 line. /// Last line will be a single newline character. #[must_use] pub fn calc_buf_size(&self) -> usize { let mut size = 0; for n in &self.lines { size += n.key.len() + 1; // including ' ' size += n.value.len() + 1; // including '\n' } size + 1 // terminating '\n' } /// Serialize object into a `Vec<u8>` buffer suitable for transmission. #[must_use] pub fn serialize(&self) -> Vec<u8> { let mut buf = Vec::new(); for n in &self.lines { let k = n.key.as_bytes(); let v = n.value.as_bytes(); for a in k { buf.push(*a); } buf.push(b' '); for a in v { buf.push(*a); } buf.push(b'\n'); } buf.push(b'\n'); buf } /// Write the Params to a buffer. pub fn encoder_write(&self, buf: &mut BytesMut) { // Calculate the required buffer size let size = self.calc_buf_size(); // Reserve space buf.reserve(size); // Write data to output buffer for n in &self.lines { buf.put(n.key.as_bytes()); buf.put_u8(b' '); buf.put(n.value.as_bytes()); buf.put_u8(b'\n'); } buf.put_u8(b'\n'); } /// Consume the Params buffer and return the internal key/value list as a /// `Vec<KeyValue>` #[must_use] pub fn into_inner(self) -> Vec<KeyValue> { self.lines } } impl From<Vec<KeyValue>> for KVLines { fn from(lines: Vec<KeyValue>) -> Self { Self { lines } } } impl TryFrom<Vec<(String, String)>> for KVLines { type Error = Error; fn try_from(lines: Vec<(String, String)>) -> Result<Self, Self::Error> { let mut out = Self { lines: Vec::new() }; for (key, value) in lines { out.append(key, value)?; } Ok(out) } } impl fmt::Display for KVLines { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let mut kvlist = Vec::new(); for n in &self.lines { kvlist.push(format!("{}={}", n.key, n.value)); } write!(f, "{{{}}}", kvlist.join(",")) } } // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Changes to src/lib.rs.
1 | //! A protocol and a communication library for a mostly line-based key/value | | | 1 2 3 4 5 6 7 8 9 | //! A protocol and a communication library for a mostly line-based key/value //! protocol. //! //! # Communication buffers //! _blather_ defines a few buffers which it uses to send and receive //! information over its communication module. //! //! ## Telegrams //! The most central communication buffer is [`Telegram`], which |
︙ | ︙ | |||
17 18 19 20 21 22 23 | //! //! tg.add_param("Name", "Frank Foobar"); //! tg.add_param("Job", "Secret Agent"); //! tg.add_param("Age", "42"); //! //! assert_eq!(tg.get_topic(), "AddUser"); //! assert_eq!(tg.get_str("Name").unwrap(), "Frank Foobar"); | > | | > > > | > | | > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | //! //! tg.add_param("Name", "Frank Foobar"); //! tg.add_param("Job", "Secret Agent"); //! tg.add_param("Age", "42"); //! //! assert_eq!(tg.get_topic(), "AddUser"); //! assert_eq!(tg.get_str("Name").unwrap(), "Frank Foobar"); //! assert_eq!(tg.get_fromstr::<u32, _>("Nonexistent").unwrap(), None); //! assert_eq!(tg.get_fromstr::<u8, _>("Age").unwrap(), Some(42)); //! ``` //! //! ## Params //! These are simple key/value pairs, which can be seen as `HashMap`'s with //! some restrictions on key names. //! //! ``` //! use blather::Params; //! //! let mut params = Params::new(); //! //! params.add_param("Name", "Frank Foobar"); //! params.add_param("Job", "Secret Agent"); //! params.add_param("Age", "42"); //! //! assert_eq!(params.get_str("Name").unwrap(), "Frank Foobar"); //! assert_eq!(params.get_fromstr::<u8, _>("Age").unwrap(), Some(42)); //! ``` //! //! A set of "parameters", represented by the Params struct, is a set of //! key/value pairs. They look similar to `Telegrams` because the `Telegram`'s //! implement their key/value paris using a `Params` buffer. //! //! # Communication //! blather handles transmission using tokio-util's //! [`Framed`](tokio_util::codec::Framed) framework, by //! implementing its own [`Codec`]. It can be used to send and //! receive the various communication buffers supported by the crate. #![deny(missing_docs)] #![deny(rustdoc::missing_crate_level_docs)] #![cfg_attr(docsrs, feature(doc_cfg))] pub mod codec; mod err; mod kvlines; mod params; mod telegram; mod validators; pub use codec::Codec; pub use err::{Error, ParamError}; pub use kvlines::{KVLines, KeyValue}; pub use params::Params; pub use telegram::Telegram; // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Added src/params.rs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 | //! The `Params` buffer is a set of unorderded key/value pairs, with unique //! keys. //! //! It's similar to a `HashMap`, but has constraints on key names values, due //! to having a defined serialization format. use std::{collections::HashMap, fmt, str::FromStr}; use bytes::{BufMut, BytesMut}; use super::validators::{validate_param_key, validate_param_value}; use crate::err::{Error, ParamError}; /// Key/value parameters storage with helper methods to make adding and getting /// common value types slightly more ergonomic and using a plain `HashMap`. /// /// Uses `String`s for both keys and values internally. // ToDo: Rename `Params` to `Fields`, and call a key/value pair a `field`. #[repr(transparent)] #[derive(Debug, Clone, Default)] pub struct Params(HashMap<String, String>); impl Params { /// Create a new empty parameters object. #[must_use] pub fn new() -> Self { Self::default() } /// Reset all the key/values in `Params` object. pub fn clear(&mut self) { self.0.clear(); } /// Return the number of key/value pairs in the parameter buffer. #[must_use] pub fn len(&self) -> usize { self.0.len() } /// Returns `true` if the `Params` collection does not contain any key/value /// pairs. #[must_use] pub fn is_empty(&self) -> bool { self.0.is_empty() } /// Return reference to inner `HashMap`. #[must_use] pub const fn inner(&self) -> &HashMap<String, String> { &self.0 } /// Add a parameter. /// /// ``` /// use blather::{Params, Error, ParamError}; /// /// let mut params = Params::new(); /// /// // Add a parameter /// params.add("hello".into(), "world".into()).unwrap(); /// /// // Attempt to add a parameter with an invalid key /// let res = params.add("hell o".into(), "world".into()); /// let Err(Error::Param(ParamError::Key(msg))) = res else { /// panic!("Unexpectedly not ParamError::Key(_)"); /// }; /// assert_eq!(msg, "invalid character"); /// ``` /// /// # Errors /// [`Error::Param`] means the input parameters are invalid. It will /// contains a [`ParamError`] indicating whether the key or the value is /// invalid. /// /// # See also /// For more ergonomics with automatic conversion to strings, see /// [`Params::add_param`]. pub fn add(&mut self, key: String, value: String) -> Result<(), Error> { validate_param_key(&key)?; validate_param_value(&value)?; self.0.insert(key, value); Ok(()) } /// Add a parameter to the parameter. /// /// Both the `key` and `value` are anything convertable using the `ToString` /// trait. /// /// # Examples /// ``` /// use blather::Params; /// /// let mut params = Params::new(); /// params.add_param("integer", 42).unwrap(); /// params.add_param("string", "hello").unwrap(); /// ``` /// /// # Errors /// [`Error::Param`] means the input parameters are invalid. It will /// contains a [`ParamError`] indicating whether the key or the value is /// invalid. /// /// # See also /// If the value is a string, prefer to use [`Params::add_str()`]. #[inline] #[allow(clippy::needless_pass_by_value)] pub fn add_param( &mut self, key: impl ToString, value: impl ToString ) -> Result<(), Error> { let key = key.to_string(); let value = value.to_string(); validate_param_key(&key)?; validate_param_value(&value)?; self.0.insert(key, value); Ok(()) } /// Add a string parameter to the parameter. /// /// This function can, under some circumstances, be a little more effecient /// than [`Params::add_param()`], but offers less flexibility. /// /// # Errors /// If either the key or the value are invalid, [`Error::BadFormat`] means /// the input parameters are invalid. #[inline] #[allow(clippy::needless_pass_by_value)] pub fn add_str( &mut self, key: impl ToString, value: impl Into<String> ) -> Result<(), Error> { let key = key.to_string(); let value = value.into(); validate_param_key(&key)?; validate_param_value(&value)?; self.0.insert(key, value); Ok(()) } /// Add a boolean parameter. /// /// # Examples /// ``` /// use blather::Params; /// /// let mut params = Params::new(); /// params.add_bool("should_be_true", true).unwrap(); /// params.add_bool("should_be_false", false).unwrap(); /// assert!(matches!(params.get_bool("should_be_true"), Ok(Some(true)))); /// assert!(matches!(params.get_bool("should_be_false"), Ok(Some(false)))); /// ``` /// /// # Notes /// - Applications should not make assumptions about the specific string /// value added by this function. Do not treat boolean values as strings; /// use the [`get_bool()`](Self::get_bool) method instead. /// /// # Errors /// [`Error::Param`] with [`ParamError::Key`] indicates that the key format /// is invalid. #[inline] #[allow(clippy::needless_pass_by_value)] pub fn add_bool( &mut self, key: impl ToString, value: bool ) -> Result<(), Error> { let key = key.to_string(); let v = if value { "true" } else { "false" }; validate_param_key(&key)?; self.add_str(key, v) } /// Returns `true` if the parameter with `key` exists. Returns `false` /// otherwise. /// /// ``` /// use blather::Params; /// /// let mut params = Params::new(); /// /// assert!(!params.contains("nonexistent")); /// /// params.add_str("Exists", "Very much").unwrap(); /// assert!(params.contains("Exists")); /// ``` #[must_use] pub fn contains(&self, key: &str) -> bool { self.0.contains_key(key) } /// Call `FromStr` implementation to extract a value given a key. /// /// # Examples /// ``` /// use blather::{Params, Error, ParamError}; /// /// let mut params = Params::new(); /// /// params.add_param("arthur", 42); /// let fourtytwo = params.get_fromstr::<u32, _>("arthur").unwrap(); /// assert_eq!(fourtytwo, Some(42)); /// /// let nonexist = params.get_fromstr::<u32, _>("ford"); /// let Ok(None) = nonexist else { /// panic!("Unexpectedly not `Ok(None)`"); /// }; /// /// params.add_param("notint", "hello"); /// let res = params.get_fromstr::<u32, _>("notint"); /// let Err(Error::Param(ParamError::Value(msg))) = res else { /// panic!("Unexpectedly not Error::Param(ParamError::Value(_))"); /// }; /// assert_eq!(msg, "invalid digit found in string"); /// ``` /// /// # Errors /// Returns [`Error::Param`] containing [`ParamError::Value`] if the value /// can not be parsed. pub fn get_fromstr<T, E>(&self, key: &str) -> Result<Option<T>, Error> where T: FromStr<Err = E>, E: std::fmt::Display { self.get_str(key).map_or_else( || Ok(None), |val| { T::from_str(val).map_or_else( |e| Err(Error::Param(ParamError::Value(e.to_string()))), |v| Ok(Some(v)) ) } ) } /// Get string representation of a value for a requested key. /// /// Returns `None` if the key is not found in the inner storage. Returns /// `Some(&str)` if parameter exists. #[must_use] pub fn get_str(&self, key: &str) -> Option<&str> { let kv = self.0.get_key_value(key); if let Some((_k, v)) = kv { return Some(v); } None } /// Get a boolean value; return error if key wasn't found. /// /// # Errors /// [`Error::BadFormat`] means the input parameters are invalid. pub fn get_bool(&self, key: &str) -> Result<Option<bool>, Error> { let Some(v) = self.get_str(key) else { return Ok(None); }; let v = v.to_ascii_lowercase(); match v.as_ref() { "y" | "yes" | "t" | "true" | "1" | "on" => Ok(Some(true)), "n" | "no" | "f" | "false" | "0" | "off" => Ok(Some(false)), _ => Err(Error::Param(ParamError::Value("not boolean".into()))) } } /// Consume the `Params` buffer and return its internal `HashMap`. #[must_use] pub fn into_inner(self) -> HashMap<String, String> { self.0 } /// Calculate the size of the buffer in serialized form. /// Each entry will be a newline terminated utf-8 line. /// Last line will be a single newline character. #[must_use] pub fn calc_buf_size(&self) -> usize { let mut size = 0; for (key, value) in &self.0 { size += key.len() + 1; // including ' ' size += value.len() + 1; // including '\n' } size + 1 // terminating '\n' } /// Serialize `Params` buffer into a vector of bytes for transmission. #[must_use] pub fn serialize(&self) -> Vec<u8> { let mut buf = Vec::new(); for (key, value) in &self.0 { let k = key.as_bytes(); let v = value.as_bytes(); for a in k { buf.push(*a); } buf.push(b' '); for a in v { buf.push(*a); } buf.push(b'\n'); } buf.push(b'\n'); buf } /// Write the Params to a buffer. pub fn encoder_write(&self, buf: &mut BytesMut) { // Calculate the required buffer size let size = self.calc_buf_size(); // Reserve space buf.reserve(size); // Write data to output buffer for (key, value) in &self.0 { buf.put(key.as_bytes()); buf.put_u8(b' '); buf.put(value.as_bytes()); buf.put_u8(b'\n'); } buf.put_u8(b'\n'); } } impl Params { /// Encode a binary buffer into a parameter value. /// /// The value is stored as a base85 (RFC1924 variant) string. /// /// # Errors /// [`Error::Param`] is returned if the key is invalid, or if the base85 /// encoder inserts newlines. #[cfg(feature = "bin")] #[cfg_attr(docsrs, doc(cfg(feature = "bin")))] pub fn encode_buf( &mut self, key: impl Into<String>, buf: &[u8] ) -> Result<(), Error> { self.add(key.into(), base85::encode(buf))?; Ok(()) } /// Decode a binary buffer from a parameter value. /// /// The value is assumed to be base85 (RFC1924 variant) string. /// /// # Errors /// [`Error::Param`] with [`ParamError::Value`] is returned if the value is /// not RFC1924-compliant base85. #[cfg(feature = "bin")] #[cfg_attr(docsrs, doc(cfg(feature = "bin")))] pub fn decode_buf(&self, key: &str) -> Result<Option<Vec<u8>>, Error> { let Some(b85) = self.get_str(key) else { return Ok(None); }; let buf = base85::decode(b85) .map_err(|_| Error::Param(ParamError::Value("invalid base85".into())))?; Ok(Some(buf)) } /// Serialize a type (using bincode), transform into base85 and store as a /// parameter. /// /// # Errors /// [`Error::Param`] with [`ParamError::Key`] means the key name is /// invalid. [`Error::SerializeError`] means `data` could not be serialized. #[cfg(feature = "bincode")] #[cfg_attr(docsrs, doc(cfg(feature = "bincode")))] pub fn encode<E>( &mut self, key: impl Into<String>, data: E ) -> Result<(), Error> where E: bincode::Encode { let conf = bincode::config::standard(); let buf = bincode::encode_to_vec(data, conf) .map_err(|e| Error::SerializeError(e.to_string()))?; self.encode_buf(key, &buf)?; Ok(()) } /// Decode a parameter base85 value, then deserialize it into requested type. /// /// # Errors /// [`Error::Param`] with [`ParamError::Value`] means the parameter value /// could not be deserialized. #[cfg(feature = "bincode")] #[cfg_attr(docsrs, doc(cfg(feature = "bincode")))] pub fn decode<D>(&self, key: &str) -> Result<Option<D>, Error> where D: bincode::Decode<()> { let Some(buf) = self.decode_buf(key)? else { return Ok(None); }; let conf = bincode::config::standard(); let (data, _) = bincode::decode_from_slice(&buf, conf) .map_err(|e| Error::Param(ParamError::Value(e.to_string())))?; Ok(Some(data)) } } #[cfg(test)] #[cfg(feature = "bin")] mod buf_tests { use super::Params; #[test] fn enc_dec() { let buf = orphanage::buf::random(2048); let mut params = Params::new(); params.encode_buf("Bytes", &buf).unwrap(); let buf2 = params.decode_buf("Bytes").unwrap().unwrap(); assert_eq!(buf, buf2); } } impl Params { /// Add an anonymous vector of records. /// /// Only one list of elements should be added to a `Params` buffer. If a /// single `Params` needs to contain multiple lists, use /// [`Params::encode_named_list()`] instead. /// /// ``` /// use blather::{Params, Error}; /// /// struct Agent { /// name: String, /// age: u8 /// } /// /// let mut params = Params::default(); /// /// let mut agents = vec![ /// Agent { /// name: "frank".into(), /// age: 42 /// }, /// Agent { /// name: "anon".into(), /// age: 32 /// } /// ]; /// /// params.encode_anon_list(agents.into_iter(), |rec, v| { /// v.push(("Name".into(), rec.name)); /// v.push(("Age".into(), rec.age.to_string())); /// Ok::<(), Error>(()) /// }); /// /// assert_eq!(params.get_fromstr::<usize, _>("Count").unwrap(), Some(2)); /// /// assert_eq!(params.get_str("Name.0"), Some("frank")); /// assert_eq!(params.get_fromstr::<u8, _>("Age.0").unwrap(), Some(42)); /// /// assert_eq!(params.get_str("Name.1"), Some("anon")); /// assert_eq!(params.get_fromstr::<u8, _>("Age.1").unwrap(), Some(32)); /// ``` /// /// # Errors /// Returns an application-defined error `E`, with the constraint that it /// must be able to convert a `blather::Error` into `E`. pub fn encode_anon_list<T, I, F, E>(&mut self, it: I, f: F) -> Result<(), E> where I: IntoIterator<Item = T>, F: Fn(T, &mut Vec<(String, String)>) -> Result<(), E>, E: From<Error> { let mut count = 0; // Used for capacity let mut recs = 0; for (idx, rec) in it.into_iter().enumerate() { let mut rec_kv = Vec::with_capacity(recs); // Call closure to generate records f(rec, &mut rec_kv)?; // Predict how many records to preallocate recs = std::cmp::max(recs, rec_kv.len()); // Move indexed record fields into Params for (k, v) in rec_kv { let key = format!("{k}.{idx}"); self.add(key, v)?; } // Count record count += 1; } self.add_param("Count", count)?; Ok(()) } /// Decode an anonymous list previous generated using /// [`Params::encode_anon_list()`]. /// /// ``` /// use blather::{Params, Error}; /// /// struct Agent { /// name: String, /// age: u8 /// } /// /// let mut params = Params::new(); /// params.add_str("Name.0", "frank").unwrap(); /// params.add_param("Age.0", 42).unwrap(); /// params.add_str("Name.1", "anon").unwrap(); /// params.add_param("Age.1", 32).unwrap(); /// params.add_param("Count", 2).unwrap(); /// /// let v = params /// .decode_anon_list::<_, _, Error>(&["Name", "Age"], |recmap| { /// let name = (*recmap.get("Name").unwrap()).to_string(); /// let age = recmap.get("Age").unwrap(); /// let age = age.parse::<u8>().unwrap(); /// Ok(Agent { name, age }) /// }) /// .unwrap(); /// /// assert_eq!(v[0].name, "frank"); /// assert_eq!(v[0].age, 42); /// assert_eq!(v[1].name, "anon"); /// assert_eq!(v[1].age, 32); /// assert_eq!(v.len(), 2); /// ``` /// /// # Errors /// Returns an application-defined error `E`, with the constraint that it /// must be able to convert a `blather::Error` into `E`. pub fn decode_anon_list<T, F, E>( &self, keys: &[&str], f: F ) -> Result<Vec<T>, E> where F: Fn(&HashMap<&str, &str>) -> Result<T, E>, E: From<Error> { let mut ret = Vec::new(); let mut recmap: HashMap<&str, &str> = HashMap::new(); // Determine how many records are in the list let count = self.get_fromstr::<usize, _>("Count")?.ok_or_else(|| { Error::Param(ParamError::Key("Missing 'Count'".into())) })?; for idx in 0..count { recmap.clear(); for (k, ki) in keys.iter().map(|k| (k, format!("{k}.{idx}",))) { let Some(v) = self.0.get(&ki) else { continue; }; recmap.insert(k, v); } let vecrec = f(&recmap)?; ret.push(vecrec); } Ok(ret) } /// Add a named vector of records. /// /// This function mostly works like [`Params::encode_anon_list()`], but it /// puts all its parameters into a namespace, specified in `name`. This /// allows multiple lists to be added to the same `Params`. /// /// # Errors /// Returns an application-defined error `E`, with the constraint that it /// must be able to convert a `blather::Error` into `E`. pub fn encode_named_list<T, I, F, E>( &mut self, name: &str, it: I, f: F ) -> Result<(), E> where I: IntoIterator<Item = T>, F: Fn(T, &mut Vec<(String, String)>) -> Result<(), E>, E: From<Error> { let mut count = 0; // Used for capacity let mut recs = 0; for (idx, rec) in it.into_iter().enumerate() { let mut rec_kv = Vec::with_capacity(recs); // Call closure to generate records f(rec, &mut rec_kv)?; // Predict how many records to preallocate recs = std::cmp::max(recs, rec_kv.len()); // Move indexed record fields into Params for (k, v) in rec_kv { let key = format!("{name}.{k}.{idx}"); self.add(key, v)?; } // Count record count += 1; } let key = format!("{name}.Count"); self.add_param(key, count)?; Ok(()) } /// Decode an anonymous list previous generated using /// [`Params::encode_anon_list()`]. /// /// # Errors /// Returns an application-defined error `E`, with the constraint that it /// must be able to convert a `blather::Error` into `E`. pub fn decode_named_list<T, F, E>( &self, name: &str, keys: &[&str], f: F ) -> Result<Vec<T>, E> where F: Fn(&HashMap<&str, &str>) -> Result<T, E>, E: From<Error> { let mut ret = Vec::new(); let mut recmap: HashMap<&str, &str> = HashMap::new(); // Determine how many records are in the list let key = format!("{name}.Count"); let count = self.get_fromstr::<usize, _>(&key)?.ok_or_else(|| { Error::Param(ParamError::Key("Missing 'Count'".into())) })?; for idx in 0..count { recmap.clear(); for (k, ki) in keys.iter().map(|k| (k, format!("{name}.{k}.{idx}",))) { let Some(v) = self.0.get(&ki) else { continue; }; recmap.insert(k, v); } let vecrec = f(&recmap)?; ret.push(vecrec); } Ok(ret) } } // ToDo: Use TryFrom, and validate all the fields impl TryFrom<HashMap<String, String>> for Params { type Error = Error; fn try_from(hm: HashMap<String, String>) -> Result<Self, Self::Error> { for (k, v) in &hm { validate_param_key(k)?; validate_param_value(v)?; } Ok(Self(hm)) } } // ToDo: Just forward to inner type, and make the application use {:#?} // instead. impl fmt::Display for Params { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let mut kvlist = Vec::new(); for (key, value) in &self.0 { kvlist.push(format!("{key}={value}")); } write!(f, "{{{}}}", kvlist.join(",")) } } #[cfg(test)] mod tests { use super::Params; #[test] fn string() { let mut msg = Params::new(); msg.add_str("Foo", "bar").unwrap(); assert_eq!(msg.get_str("Foo").unwrap(), "bar"); assert_eq!(msg.get_str("Moo"), None); } #[test] fn exists() { let mut params = Params::new(); params.add_str("foo", "bar").unwrap(); assert!(params.contains("foo")); assert!(!params.contains("nonexistent")); } #[test] fn empty_value() { let mut params = Params::new(); params.add_str("foo", "").unwrap(); assert_eq!(params.get_str("foo"), Some("")); } #[test] fn integer() { let mut msg = Params::new(); msg.add_str("Num", "64").unwrap(); assert_eq!(msg.get_fromstr::<u16, _>("Num").unwrap().unwrap(), 64); } #[test] fn size() { let mut msg = Params::new(); msg.add_param("Num", 7_usize).unwrap(); assert_eq!(msg.get_fromstr::<usize, _>("Num").unwrap().unwrap(), 7); } #[test] fn intoparams() { let mut msg = Params::new(); msg.add_str("Foo", "bar").unwrap(); assert_eq!(msg.get_str("Foo").unwrap(), "bar"); assert_eq!(msg.get_str("Moo"), None); let hm = msg.into_inner(); let kv = hm.get_key_value("Foo"); if let Some((_k, v)) = kv { assert_eq!(v, "bar"); } } #[test] fn display() { let mut params = Params::new(); params.add_str("foo", "bar").unwrap(); let s = format!("{params}"); assert_eq!(s, "{foo=bar}"); } #[test] fn ser_size() { let mut params = Params::new(); params.add_str("foo", "bar").unwrap(); params.add_str("moo", "cow").unwrap(); let sz = params.calc_buf_size(); assert_eq!(sz, 8 + 8 + 1); } #[test] #[should_panic(expected = "Param(Key(\"invalid character\"))")] fn key_invalid_char() { let mut param = Params::new(); param.add_str("hell o", "world").unwrap(); } #[test] #[should_panic(expected = "Param(Key(\"empty\"))")] fn empty_key() { let mut param = Params::new(); param.add_str("", "world").unwrap(); } #[test] #[should_panic(expected = "Param(Value(\"contains newline\"))")] fn value_newline() { let mut param = Params::new(); param.add_str("greeting", "hello\nworld").unwrap(); } #[test] fn boolvals() { let mut params = Params::new(); params.add_bool("abool", true).unwrap(); params.add_bool("abooltoo", false).unwrap(); let Ok(Some(true)) = params.get_bool("abool") else { panic!("Unexpectedly not Ok(true)"); }; let Ok(Some(false)) = params.get_bool("abooltoo") else { panic!("Unexpectedly not Ok(false)"); }; } #[test] #[should_panic(expected = "Param(Value(\"not boolean\"))")] fn bad_bool() { let mut params = Params::new(); params.add_str("fool", "uncertain").unwrap(); params.get_bool("fool").unwrap(); } } #[cfg(test)] mod recvec_tests { use super::{Error, Params}; struct Agent { name: String, age: u8 } impl Agent { fn new(name: impl Into<String>, age: u8) -> Self { Self { name: name.into(), age } } } #[test] fn encode_anon() { let mut params = Params::new(); let agents = vec![Agent::new("frank", 42), Agent::new("anon", 32)]; params .encode_anon_list::<_, _, _, Error>(agents, |agent, v| { v.push(("Name".to_string(), agent.name)); v.push(("Age".to_string(), agent.age.to_string())); Ok(()) }) .unwrap(); assert_eq!(params.get_fromstr::<usize, _>("Count").unwrap().unwrap(), 2); assert_eq!(params.get_str("Name.0"), Some("frank")); assert_eq!(params.get_str("Age.0"), Some("42")); assert_eq!(params.get_str("Name.1"), Some("anon")); assert_eq!(params.get_str("Age.1"), Some("32")); } #[test] fn decode_anon() { let mut params = Params::new(); params.add_param("Name.0", "frank").unwrap(); params.add_param("Age.0", "42").unwrap(); params.add_param("Name.1", "anon").unwrap(); params.add_param("Age.1", "32").unwrap(); params.add_param("Count", "2").unwrap(); let v = params .decode_anon_list::<_, _, Error>(&["Name", "Age"], |recmap| { let name = (*recmap.get("Name").unwrap()).to_string(); let age = recmap.get("Age").unwrap(); let age = age.parse::<u8>().unwrap(); Ok(Agent { name, age }) }) .unwrap(); assert_eq!(v.len(), 2); assert_eq!(&v[0].name, "frank"); assert_eq!(v[0].age, 42); assert_eq!(&v[1].name, "anon"); assert_eq!(v[1].age, 32); } #[test] #[should_panic(expected = "Param(Key(\"Missing 'Count'\"))")] fn decode_no_count() { let params = Params::new(); let _v = params .decode_anon_list::<_, _, Error>(&["Name", "Age"], |recmap| { let name = (*recmap.get("Name").unwrap()).to_string(); let age = recmap.get("Age").unwrap(); let age = age.parse::<u8>().unwrap(); Ok(Agent { name, age }) }) .unwrap(); } #[test] #[should_panic(expected = "Param(Value(\"invalid digit found in string\"))")] fn decode_bad_count() { let mut params = Params::new(); params.add_param("Count", "moo").unwrap(); let _v = params .decode_anon_list::<_, _, Error>(&["Name", "Age"], |recmap| { let name = (*recmap.get("Name").unwrap()).to_string(); let age = recmap.get("Age").unwrap(); let age = age.parse::<u8>().unwrap(); Ok(Agent { name, age }) }) .unwrap(); } #[test] fn encode_named() { let mut params = Params::new(); let agents = vec![Agent::new("frank", 42), Agent::new("anon", 32)]; params .encode_named_list::<_, _, _, Error>("Agents", agents, |agent, v| { v.push(("Name".to_string(), agent.name)); v.push(("Age".to_string(), agent.age.to_string())); Ok(()) }) .unwrap(); assert_eq!( params .get_fromstr::<usize, _>("Agents.Count") .unwrap() .unwrap(), 2 ); assert_eq!(params.get_str("Agents.Name.0"), Some("frank")); assert_eq!(params.get_str("Agents.Age.0"), Some("42")); assert_eq!(params.get_str("Agents.Name.1"), Some("anon")); assert_eq!(params.get_str("Agents.Age.1"), Some("32")); } #[test] fn decode_named() { let mut params = Params::new(); params.add_param("Agents.Name.0", "frank").unwrap(); params.add_param("Agents.Age.0", "42").unwrap(); params.add_param("Agents.Name.1", "anon").unwrap(); params.add_param("Agents.Age.1", "32").unwrap(); params.add_param("Agents.Count", "2").unwrap(); let v = params .decode_named_list::<_, _, Error>("Agents", &["Name", "Age"], |recmap| { let name = (*recmap.get("Name").unwrap()).to_string(); let age = recmap.get("Age").unwrap(); let age = age.parse::<u8>().unwrap(); Ok(Agent { name, age }) }) .unwrap(); assert_eq!(v.len(), 2); assert_eq!(&v[0].name, "frank"); assert_eq!(v[0].age, 42); assert_eq!(&v[1].name, "anon"); assert_eq!(v[1].age, 32); } } // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Added src/telegram.rs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 | //! Telegrams are objects that contain a _topic_ and a set of zero or more //! parameters. They can be serialized into a line-based format for //! transmission over a network link. use std::{ collections::HashMap, fmt, ops::{Deref, DerefMut} }; use bytes::{BufMut, BytesMut}; use crate::err::Error; use super::{params::Params, validators::validate_topic}; /// Representation of a Telegram; a buffer which contains a _topic_ and a set /// of key/value parameters. /// /// Internally the key/value parameters are represented by a [`Params`] /// structure. #[derive(Debug, Clone)] pub struct Telegram { topic: String, params: Params } impl Deref for Telegram { type Target = Params; fn deref(&self) -> &Self::Target { &self.params } } impl DerefMut for Telegram { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.params } } impl AsRef<str> for Telegram { fn as_ref(&self) -> &str { &self.topic } } impl Telegram { /// Create a new telegram object. /// /// # Panics /// The `topic` must be valid. #[must_use] #[allow(clippy::needless_pass_by_value)] pub fn new(topic: impl ToString) -> Self { let topic = topic.to_string(); assert!(validate_topic(&topic).is_ok()); Self { topic, params: Params::default() } } /// Fallibly create a new `Telegram` object. /// /// # Errors /// [`Error::BadFormat`] means the topic is invalid. pub fn try_new(topic: impl Into<String>) -> Result<Self, Error> { let topic = topic.into(); validate_topic(&topic)?; Ok(Self { topic, params: Params::default() }) } /// Create a new `Telegram` object with pre-built [`Params`]. /// /// # Panics /// The `topic` must be valid. pub fn with_params(topic: impl Into<String>, params: Params) -> Self { let topic = topic.into(); validate_topic(&topic).unwrap(); Self { topic, params } } /// Fallibly create a new `Telegram`, with a pre-built [`Params`]. /// /// # Errors /// [`Error::BadFormat`] means the topic is invalid. #[allow(clippy::needless_pass_by_value)] pub fn try_with_params( topic: impl ToString, params: Params ) -> Result<Self, Error> { let topic = topic.to_string(); validate_topic(&topic)?; Ok(Self { topic, params }) } /// Internal factory function for creating a `Telegram` with an empty topic. /// /// This is intended to be used only by the codec. pub(crate) fn new_uninit() -> Self { Self { topic: String::new(), params: Params::default() } } /// Return the number of key/value parameters in the Telegram object. /// /// # Examples /// ``` /// use blather::Telegram; /// /// let mut tg = Telegram::new("SomeTopic"); /// assert_eq!(tg.num_params(), 0); /// tg.add_param("cat", "meow"); /// assert_eq!(tg.num_params(), 1); /// ``` /// /// # Notes /// This is a wrapper around [`Params::len()`](crate::Params::len). #[must_use] pub fn num_params(&self) -> usize { self.params.len() } /// Get a reference to the internal parameters object. #[must_use] pub const fn params(&self) -> &Params { &self.params } /// Get a mutable reference to the inner [`Params`] object. /// /// ``` /// use blather::Telegram; /// /// let mut tg = Telegram::new("Topic"); /// tg.add_param("cat", "meow"); /// assert_eq!(tg.num_params(), 1); /// tg.params_mut().clear(); /// assert_eq!(tg.num_params(), 0); /// ``` pub const fn params_mut(&mut self) -> &mut Params { &mut self.params } /// Get a reference the the parameter's internal `HashMap`. /// /// Note: The inner representation of the Params object may change in the /// future. #[must_use] pub const fn get_params_inner(&self) -> &HashMap<String, String> { self.params.inner() } /// Set topic for telegram. /// /// Overwrites current topic is one has already been set. /// /// # Examples /// ``` /// use blather::{Telegram, Error}; /// /// let mut tg = Telegram::new("SomeTopic"); /// assert!(matches!(tg.set_topic("Hello"), Ok(()))); /// /// let e = Error::BadFormat("Invalid topic character".to_string()); /// assert!(matches!(tg.set_topic("Hell o"), Err(e))); /// ``` /// /// # Errors /// [`Error::BadFormat`] means the input parameters are invalid. pub fn set_topic(&mut self, topic: &str) -> Result<(), Error> { validate_topic(topic)?; self.topic = topic.to_string(); Ok(()) } /// Get a reference to the topic string, or None if topic is not been set. /// /// # Examples /// ``` /// use blather::{Telegram, Error}; /// /// let tg = Telegram::new("SomeTopic"); /// assert_eq!(tg.get_topic(), "SomeTopic"); /// ``` #[must_use] pub fn get_topic(&self) -> &str { self.topic.as_ref() } /// Calculate the size of a serialized version of this Telegram object. /// If no topic has been set it is simply ignored. In the future this might /// change to something more dramatic, like a panic. Telegrams should always /// contain a topic when transmitted. /// /// Each line is terminated by a newline character. /// The last line consists of a single newline character. #[must_use] pub fn calc_buf_size(&self) -> usize { // Calculate the required buffer size let mut size = 0; size += self.topic.len() + 1; // including '\n' // Note that the Params method reserves the final terminating newline. size + self.params.calc_buf_size() } /// Serialize `Telegram` into a vector of bytes for transmission. /// /// # Errors /// [`Error::BadFormat`] the `Telegram` is missing a topic. pub fn serialize(&self) -> Result<Vec<u8>, Error> { let mut buf = Vec::new(); if self.topic.is_empty() { return Err(Error::BadFormat("Missing heading".to_string())); } // Copy topic let b = self.topic.as_bytes(); for a in b { buf.push(*a); } buf.push(b'\n'); for (key, value) in self.get_params_inner() { let k = key.as_bytes(); let v = value.as_bytes(); for a in k { buf.push(*a); } buf.push(b' '); for a in v { buf.push(*a); } buf.push(b'\n'); } buf.push(b'\n'); Ok(buf) } /// Write the Telegram to a `BytesMut` buffer. /// /// # Errors /// [`Error::SerializeError`] the `Telegram` is missing a topic. pub fn encoder_write(&self, buf: &mut BytesMut) -> Result<(), Error> { if self.topic.is_empty() { return Err(Error::SerializeError("Missing Telegram topic".to_string())); } // Calculate the required buffer size let size = self.calc_buf_size(); // Reserve space buf.reserve(size); // Write data to output buffer buf.put(self.topic.as_bytes()); buf.put_u8(b'\n'); for (key, value) in self.get_params_inner() { buf.put(key.as_bytes()); buf.put_u8(b' '); buf.put(value.as_bytes()); buf.put_u8(b'\n'); } buf.put_u8(b'\n'); Ok(()) } /// Consume the Telegram buffer and return the internal parameters object. #[must_use] pub fn into_params(self) -> Params { self.params } /// Unwrap the `Telegram` into a topic and `Params`. #[must_use] pub fn unwrap_topic_params(self) -> (String, Params) { (self.topic, self.params) } } impl From<String> for Telegram { fn from(topic: String) -> Self { Self { topic, params: Params::default() } } } impl TryFrom<(&str, Params)> for Telegram { type Error = Error; fn try_from(t: (&str, Params)) -> Result<Self, Self::Error> { validate_topic(t.0)?; Ok(Self { topic: t.0.to_string(), params: t.1 }) } } impl TryFrom<(String, Params)> for Telegram { type Error = Error; fn try_from(t: (String, Params)) -> Result<Self, Self::Error> { validate_topic(&t.0)?; Ok(Self { topic: t.0, params: t.1 }) } } impl fmt::Display for Telegram { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{}:{}", self.topic, self.params) } } #[cfg(test)] mod tests { use super::{Error, Params, Telegram}; #[test] fn simple() { let mut tg = Telegram::new("SomeTopic"); assert_eq!(tg.get_topic(), "SomeTopic"); tg.add_str("Foo", "bar").unwrap(); assert_eq!(tg.get_str("Foo").unwrap(), "bar"); assert_eq!(tg.get_str("Moo"), None); } #[test] fn exist() { let mut tg = Telegram::new("SomeTopic"); tg.add_str("foo", "bar").unwrap(); assert!(tg.contains("foo")); assert!(!tg.contains("nonexistent")); } #[test] fn integer() { let mut tg = Telegram::new("SomeTopic"); assert_eq!(tg.get_topic(), "SomeTopic"); tg.add_str("Num", "64").unwrap(); assert_eq!(tg.get_fromstr::<u16, _>("Num").unwrap().unwrap(), 64); } #[test] fn size() { let mut tg = Telegram::new("SomeTopic"); tg.add_param("Num", 7_usize).unwrap(); assert_eq!(tg.get_fromstr::<usize, _>("Num").unwrap().unwrap(), 7); } #[test] fn intoparams() { let mut tg = Telegram::new("SomeTopic"); tg.add_str("Foo", "bar").unwrap(); assert_eq!(tg.get_str("Foo").unwrap(), "bar"); assert_eq!(tg.get_str("Moo"), None); let params = tg.into_params(); let val = params.get_str("Foo"); assert_eq!(val.unwrap(), "bar"); } #[test] fn display() { let mut tg = Telegram::new("hello"); tg.add_param("foo", "bar").unwrap(); let s = format!("{tg}"); assert_eq!(s, "hello:{foo=bar}"); } #[test] fn ser_size() { let mut tg = Telegram::new("hello"); tg.add_str("foo", "bar").unwrap(); tg.add_str("moo", "cow").unwrap(); let sz = tg.calc_buf_size(); assert_eq!(sz, 6 + 8 + 8 + 1); } #[test] fn bad_topic_leading() { let mut tg = Telegram::new("Hello"); let Err(Error::BadFormat(msg)) = tg.set_topic(" SomeTopic") else { panic!("Unexpectedly not Error::BadFormat"); }; assert_eq!(msg, "Invalid leading topic character"); } #[test] fn bad_topic() { let mut tg = Telegram::new("Hello"); let Err(Error::BadFormat(msg)) = tg.set_topic("Some Topic") else { panic!("Unexpectedly not Error::BadFormat"); }; assert_eq!(msg, "Invalid topic character"); } #[test] fn create_from_tuple() { let mut params = Params::new(); params.add_str("my", "word").unwrap(); let tg = Telegram::try_from(("Hello", params)).unwrap(); assert_eq!(tg.get_str("my"), Some("word")); } } // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Deleted src/types.rs.
|
| < < < < < < < < < < < < < < |
Deleted src/types/kvlines.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted src/types/params.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted src/types/telegram.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted src/types/validators.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Added src/validators.rs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | use crate::err::{Error, ParamError}; fn is_topic_leading_char(c: char) -> bool { c.is_alphabetic() } fn is_topic_char(c: char) -> bool { c.is_alphanumeric() || c == '_' || c == '-' } /// Make sure that topic string is valid. pub fn validate_topic(topic: &str) -> Result<(), Error> { let mut chars = topic.chars(); match chars.next() { Some(c) => { if !is_topic_leading_char(c) { return Err(Error::BadFormat( "Invalid leading topic character".to_string() )); } } None => return Err(Error::BadFormat("Empty or broken topic".to_string())) } if chars.any(|c| !is_topic_char(c)) { return Err(Error::BadFormat("Invalid topic character".to_string())); } Ok(()) } fn is_key_char(c: char) -> bool { c.is_alphanumeric() || c.is_ascii_punctuation() } /// Make sure that a parameter key is valid. pub fn validate_param_key(key: &str) -> Result<(), Error> { if key.is_empty() { return Err(Error::Param(ParamError::Key("empty".into()))); } let mut chars = key.chars(); if chars.any(|c| !is_key_char(c)) { return Err(Error::Param(ParamError::Key("invalid character".into()))); } Ok(()) } /// Make sure that a parameter value is valid. pub fn validate_param_value(val: &str) -> Result<(), Error> { (!val.contains('\n')).then_some(()).ok_or_else(|| { Error::Param(ParamError::Value("contains newline".into())) })?; Ok(()) } #[cfg(test)] mod tests { use super::{validate_param_value, validate_topic, Error}; #[test] fn ok_topic_1() { assert!(validate_topic("Foobar").is_ok()); } #[test] fn empty_topic() { let Err(Error::BadFormat(msg)) = validate_topic("") else { panic!("Unexpectedly not Error::BadFormat"); }; assert_eq!(msg, "Empty or broken topic"); } #[test] fn broken_topic_1() { let Err(Error::BadFormat(msg)) = validate_topic("foo bar") else { panic!("Unexpectedly not Error::BadFormat"); }; assert_eq!(msg, "Invalid topic character"); } #[test] fn broken_topic_2() { let Err(Error::BadFormat(msg)) = validate_topic(" foobar") else { panic!("Unexpectedly not Error::BadFormat"); }; assert_eq!(msg, "Invalid leading topic character"); } #[test] fn okval() { validate_param_value("hello world").unwrap(); } #[test] #[should_panic(expected = "Param(Value(\"contains newline\"))")] fn val_newline() { validate_param_value("hello\nworld").unwrap(); } } // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Deleted tests/conn_telegram.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/params.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/params_strvec.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/telegram.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/tg_to_expect.rs.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to www/changelog.md.
1 2 3 4 5 6 | # Change Log ⚠️ indicates a breaking change. ## [Unreleased] | > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | # Change Log ⚠️ indicates a breaking change. ## [Unreleased] [Details](/vdiff?from=blather-0.12.0&to=trunk) ### Added ### Changed ### Removed --- ## [0.12.0] - 2025-05-13 [Details](/vdiff?from=blather-0.11.0&to=blather-0.12.0) ### Added - Proper value validation. - `Params::get_fromstr()` takes the place of `get_param()`, and is more explicit about what it does -- call the `FromStr` trait to parse the parameter's value. - Added the ability to the codec `Decoder` to send incoming `Bytes` through a channel. This can be activated using `Codec::expect_bytes_channel()`. - `Error::Param` and `ParamError` are used to signal errors when getting/setting parameters from/to `Params`. - `Params::add()` was added as a no-conversion means to add `String`s to a `Params`. - The `bool` parser in `Params` now also recognizes `on` and `off`. - `Params::encode_anon_list()`/`Params::decode_anon_list()` can be used to encode a `Vec<T>` in a `Params` buffer. - `Params::encode_named_list()`/`Params_decode_named_list()` serve the same role as their `anon` counter-parts, but the `named` variant supports using a namespace, allowing multiple lists in the same `Params` buffer. - Support for encoding/decoding binary data into `Params` values. Requires the feature `bin`. - Support for encoding/decoding types into/from Params values using the `bincode` crate. Requires the feature `bincode`. ### Changed - ⚠️ Major redesign - `Telegram` no longer reimplement methods as thin wrappers around `Params`. Instead it implements `Deref` and `DerefMut` so the `Params`' functionality can be accessed through the `Telegram`. - Removed the `types` module; moved all its submodules to the top module. - Added missing error-handling in various places. - ⚠️ Methods that previously could return `Error::KeyNotFound` now wrap their return value in `Option` instead. - ⚠️ Renamed `Params::have()` to `Params::contains()`. - ⚠️ `From<HashMap<String, String>> for Paramas` changed to `TryFrom`, and now performs key/value validation. ### Removed - ⚠️ All the `_def` methods have been removed. Use iterator adapters instead. - ⚠️ Removed the `codec/utils` module, including its `expect_telegram()` function. - ⚠️ `Error::BadState` was removed. It was unused. - ⚠️ `Error::KeyNotFound` was removed. Instead, methods use `Option` to signal that a key was not found. --- ## [0.11.0] - 2024-09-22 [Details](/vdiff?from=blather-0.10.1&to=blather-0.11.0) |
︙ | ︙ |
Changes to www/index.md.
1 2 3 4 5 6 7 8 9 10 11 12 | # blather A talkative, somwhat reminiscent of HTTP, line-based protocol, implemented as a tokio-util Codec. ## Change log The details of changes can always be found in the timeline, but for a high-level view of changes between released versions there's a manually maintained [Change Log](./changelog.md). | > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # blather A talkative, somwhat reminiscent of HTTP, line-based protocol, implemented as a tokio-util Codec. ## Feature labels in documentation The crate's documentation uses automatically generated feature labels, which currently requires nightly featuers. To build the documentation locally use: ``` $ RUSTFLAGS="--cfg docsrs" RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features ``` ## Change log The details of changes can always be found in the timeline, but for a high-level view of changes between released versions there's a manually maintained [Change Log](./changelog.md). |