{"header":{"message":"refactor: url handling","description":null,"timestamp":"2026-04-03T11:26:39.604607928Z","authors":[{}]},"hash":"WRBOA3JH5NUP47SV755EX77CAVDL4HGOVZZWF2BBB6FSPA3N3RQQC","authors":[{"login":"tetov","key":"5HQnLNFtg9kqy7Qbt6KVMLvtgUhtPcUGET8SoKVUDNNF"}],"deps":{"hashes":[["WRBOA3JH5NUP47SV755EX77CAVDL4HGOVZZWF2BBB6FSPA3N3RQQC","refactor: url handling"],["AA",null],["F6WZWYNDIMFPVDTZC6SLW67IFJD5AKOU4SK5HMYHFCAKIJKZFQLAC","add bench for parse_url, split funcs into lib"],["MGWNH72NNBWQCVZ7HSIFSUYHC4MSKJKLQA42UIR3VM6ULF3H2TZQC","scaffolding"]],"deps":["F6WZWYNDIMFPVDTZC6SLW67IFJD5AKOU4SK5HMYHFCAKIJKZFQLAC"],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"url.rs","metadata":0},"context":[{"change":4,"pos":15}],"contents":[{"Add":"//! URL and query string parsing for pijul HTTP protocol."},{"Add":""},{"Add":"use std::collections::HashMap;"},{"Add":""},{"Add":"/// Decode URL percent-encoded string."},{"Add":"///"},{"Add":"/// Handles:"},{"Add":"/// - `%XX` hex escapes (e.g., `%20` -> space)"},{"Add":"/// - `+` as space (application/x-www-form-urlencoded convention)"},{"Add":"///"},{"Add":"/// # Pijul Protocol Usage"},{"Add":"/// Used to decode channel names and other parameters that may contain"},{"Add":"/// special characters in the query string."},{"Add":"fn percent_decode(s: &str) -> String {"},{"Add":" let mut result = String::new();"},{"Add":" let mut chars = s.chars().peekable();"},{"Add":" while let Some(c) = chars.next() {"},{"Add":" match c {"},{"Add":" '%' => {"},{"Add":" let hex: String = chars.by_ref().take(2).collect();"},{"Add":" if hex.len() == 2"},{"Add":" && let Ok(byte) = u8::from_str_radix(&hex, 16)"},{"Add":" {"},{"Add":" result.push(byte as char);"},{"Add":" } else {"},{"Add":" result.push('%');"},{"Add":" result.push_str(&hex)"},{"Add":" }"},{"Add":" }"},{"Add":" '+' => result.push(' '),"},{"Add":" _ => result.push(c),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" result"},{"Add":"}"},{"Add":""},{"Add":"/// Parse a query string into a multi-value parameter map."},{"Add":"///"},{"Add":"/// Handles:"},{"Add":"/// - `key=value` pairs separated by `&`"},{"Add":"/// - Keys without values (e.g., `?id` -> `{\"id\": [\"\"]}``)"},{"Add":"/// - Multiple values for the same key (e.g., `?path=a&path=b`)"},{"Add":"/// - Percent-decoded values"},{"Add":"///"},{"Add":"/// # Pijul Protocol Usage"},{"Add":"/// The pijul protocol sometimes uses repeated parameters (e.g., `path` can"},{"Add":"/// appear multiple times for filtering). This parser preserves all values."},{"Add":"fn parse_query(query_str: &str) -> HashMap> {"},{"Add":" let mut map: HashMap> = HashMap::new();"},{"Add":" for pair in query_str.split('&').filter(|p| !p.is_empty()) {"},{"Add":" let (k, v) = pair.split_once('=').unwrap_or((pair, \"\"));"},{"Add":" map.entry(k.to_string())"},{"Add":" .or_default()"},{"Add":" .push(percent_decode(v));"},{"Add":" }"},{"Add":" map"},{"Add":"}"},{"Add":""},{"Add":"/// Parse a request URL into path and query components."},{"Add":"///"},{"Add":"/// # Returns"},{"Add":"/// Tuple of (path, Query) where:"},{"Add":"/// - `path`: URL path with leading `/` stripped (e.g., `\".pijul\"`)"},{"Add":"/// - `Query`: Parsed query parameters"},{"Add":"///"},{"Add":"/// # Pijul Protocol Usage"},{"Add":"/// The pijul HTTP protocol routes all requests to `/.pijul` with query"},{"Add":"/// parameters determining the operation. The path is checked to ensure"},{"Add":"/// it starts with `.pijul` before processing."},{"Add":"///"},{"Add":"/// # Example"},{"Add":"/// ```"},{"Add":"/// use pijul_srv_lite::url::parse_url;"},{"Add":"/// let (path, query) = parse_url(\"/.pijul?channel=main&id\");"},{"Add":"/// assert_eq!(path, \".pijul\");"},{"Add":"/// assert_eq!(query.get(\"channel\").unwrap().as_slice(), [\"main\"]);"},{"Add":"/// assert_eq!(query.get(\"id\").unwrap().len(), 1);"},{"Add":"/// ```"},{"Add":"pub fn parse_url(url: &str) -> (String, HashMap>) {"},{"Add":" let (path, query_str) = url.split_once('?').unwrap_or((url, \"\"));"},{"Add":" let path = path.trim_start_matches('/');"},{"Add":""},{"Add":" (path.into(), parse_query(query_str))"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"mod tests {"},{"Add":" use super::*;"},{"Add":""},{"Add":" #[test]"},{"Add":" fn test_parse_query() {"},{"Add":" let result = parse_query(\"param1=hello¶m2=world\");"},{"Add":" assert_eq!(result.get(\"param1\"), Some(&vec![\"hello\".to_string()]));"},{"Add":" assert_eq!(result.get(\"param2\"), Some(&vec![\"world\".to_string()]));"},{"Add":""},{"Add":" let result = parse_query(\"param1=hello¶m2=world¶m3\");"},{"Add":" assert_eq!(result.get(\"param3\"), Some(&vec![\"\".to_string()]));"},{"Add":""},{"Add":" let result = parse_query(\"param1=hello¶m2=world¶m3¶m4=next%20param\");"},{"Add":" assert_eq!(result.get(\"param4\"), Some(&vec![\"next param\".to_string()]));"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn test_parse_query_multi_value() {"},{"Add":" let result = parse_query(\"path=src&path=lib&channel=main\");"},{"Add":" assert_eq!("},{"Add":" result.get(\"path\"),"},{"Add":" Some(&vec![\"src\".to_string(), \"lib\".to_string()])"},{"Add":" );"},{"Add":" assert_eq!(result.get(\"channel\"), Some(&vec![\"main\".to_string()]));"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn test_parse_url() {"},{"Add":" let (path, query) = parse_url(\"/.pijul\");"},{"Add":" assert_eq!(path, \".pijul\");"},{"Add":" assert!(query.is_empty());"},{"Add":""},{"Add":" let (path, query) = parse_url(\"/.pijul?channel=main&id\");"},{"Add":" assert_eq!(path, \".pijul\");"},{"Add":" assert_eq!(query.get(\"channel\"), Some(&vec![\"main\".to_string()]));"},{"Add":" assert_eq!(query.get(\"id\"), Some(&vec![\"\".to_string()]));"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn test_percent_decode() {"},{"Add":" assert_eq!(percent_decode(\"Hello%20World%21\"), \"Hello World!\");"},{"Add":" assert_eq!("},{"Add":" percent_decode(\"~%20is%20where%20the%20%3C3%20is\"),"},{"Add":" \"~ is where the <3 is\""},{"Add":" );"},{"Add":""},{"Add":" // ascii extended not allowed"},{"Add":" assert_ne!("},{"Add":" percent_decode(\"My%20pijul%20channel%20is%20named%20%22G%C3%B6ta+kanal%22\"),"},{"Add":" \"My pijul channel is named \\\"Göta kanal\\\"\""},{"Add":" );"},{"Add":" }"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":2,"pos":31},"path":"src/lib.rs","line":1,"ins":{"up_context":[{"change":2,"pos":31}],"down_context":[],"flag":"BLOCK","start":4715,"end":4728,"inode":{"change":2,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":31},"to":{"change":2,"start":32,"end":2721},"introduced_by":2}],"inode":{"change":2,"pos":31}},"ins_contents":[{"Add":"pub mod url;"}],"del_contents":[{"Del":"use std::collections::HashMap;\n\nfn percent_decode(s: &str) -> String {\n let mut result = String::new();\n let mut chars = s.chars().peekable();\n while let Some(c) = chars.next() {\n if c == '%' {\n let hex: String = chars.by_ref().take(2).collect();\n if hex.len() == 2\n && let Ok(byte) = u8::from_str_radix(&hex, 16)\n {\n result.push(byte as char);\n continue;\n }\n result.push('%');\n result.push_str(&hex);\n } else if c == '+' {\n result.push(' ');\n } else {\n result.push(c);\n }\n }\n result\n}\n\nfn parse_query(query_str: &str) -> HashMap {\n query_str\n .split('&')\n .filter_map(|pair| {\n if pair.is_empty() {\n return None;\n }\n let (k, v) = pair.split_once('=').unwrap_or((pair, \"\"));\n Some((k.to_string(), percent_decode(v)))\n })\n .collect()\n}\n\npub fn parse_url(url: &str) -> (String, HashMap) {\n let (path, query_str) = url.split_once('?').unwrap_or((url, \"\"));\n let path = path.trim_start_matches('/');\n\n (path.into(), parse_query(query_str))\n}\n\n#[cfg(test)]\nmod tests {\n use super::*;\n\n #[test]\n fn test_parse_query() {\n let mut params: HashMap = HashMap::new();\n\n params.insert(\"param1\".into(), \"hello\".into());\n params.insert(\"param2\".into(), \"world\".into());\n assert_eq!(parse_query(\"param1=hello¶m2=world\"), params);\n\n params.insert(\"param3\".into(), \"\".into());\n assert_eq!(parse_query(\"param1=hello¶m2=world¶m3\"), params);\n\n params.insert(\"param4\".into(), \"next param\".into());\n assert_eq!(\n parse_query(\"param1=hello¶m2=world¶m3¶m4=next%20param\"),\n params\n );\n }\n\n #[test]\n fn test_parse_url() {\n let mut params: HashMap = HashMap::new();\n\n assert_eq!(parse_url(\"/.pijul\"), (\".pijul\".into(), params.clone()));\n\n params.insert(\"a_param\".into(), \"a value\".into());\n\n assert_eq!(parse_url(\"/.pijul?a_param=a%20value\"), (\".pijul\".into(), params.clone()));\n }\n\n #[test]\n fn test_percent_decode() {\n assert_eq!(percent_decode(\"Hello%20World%21\"), \"Hello World!\");\n assert_eq!(\n percent_decode(\"~%20is%20where%20the%20%3C3%20is\"),\n \"~ is where the <3 is\"\n );\n\n // ascii extended not allowed\n // assert_eq!(percent_decode(\"My%20pijul%20channel%20is%20named%20%22G%C3%B6ta+kanal%22\"),\"My pijul channel is named \\\"Göta kanal\\\"\");\n }\n}\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":1,"ins":{"up_context":[{"change":2,"pos":2771}],"down_context":[{"change":2,"pos":2803}],"flag":"BLOCK","start":4729,"end":4765,"inode":{"change":2,"pos":2771}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2771},"to":{"change":2,"start":2772,"end":2803},"introduced_by":2}],"inode":{"change":2,"pos":2771}},"ins_contents":[{"Add":"use pijul_srv_lite::url::parse_url;"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Edit":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2835},"to":{"change":2,"start":2835,"end":2866},"introduced_by":2}],"inode":{"change":2,"pos":2771}}},"contents":[{"Del":"use pijul_srv_lite::parse_url;\n"}]}},{"Edit":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":44,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4031},"to":{"change":2,"start":4031,"end":4032},"introduced_by":2}],"inode":{"change":2,"pos":2771}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":56,"ins":{"up_context":[{"change":2,"pos":4315}],"down_context":[{"change":2,"pos":4411}],"flag":"BLOCK","start":4766,"end":4900,"inode":{"change":2,"pos":2771}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4315},"to":{"change":2,"start":4315,"end":4411},"introduced_by":2}],"inode":{"change":2,"pos":2771}},"ins_contents":[{"Add":" if let Some(change) = query.get(\"change\")"},{"Add":" && !change.is_empty()"},{"Add":" {"},{"Add":" return serve_change(repo_path, &change[0]);"}],"del_contents":[{"Del":" if let Some(change) = query.get(\"change\") {\n return serve_change(repo_path, change);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":62,"ins":{"up_context":[{"change":2,"pos":4418}],"down_context":[{"change":2,"pos":4482}],"flag":"BLOCK","start":4901,"end":5021,"inode":{"change":2,"pos":2771}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4418},"to":{"change":2,"start":4418,"end":4482},"introduced_by":2}],"inode":{"change":2,"pos":2771}},"ins_contents":[{"Add":" if let Some(changelist) = query.get(\"changelist\")"},{"Add":" && !changelist.is_empty()"},{"Add":" && changelist[0] == \"0\""}],"del_contents":[{"Del":" if query.get(\"changelist\").map(String::as_str) == Some(\"0\")\n"}]}},{"Edit":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":66,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4534}],"down_context":[{"change":2,"pos":4534}],"flag":"BLOCK","start":5022,"end":5053,"inode":{"change":2,"pos":2771}}},"contents":[{"Add":" && !channel.is_empty()"}]}},{"Replacement":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":68,"ins":{"up_context":[{"change":2,"pos":4540}],"down_context":[{"change":2,"pos":4593}],"flag":"BLOCK","start":5054,"end":5111,"inode":{"change":2,"pos":2771}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4540},"to":{"change":2,"start":4540,"end":4593},"introduced_by":2}],"inode":{"change":2,"pos":2771}},"ins_contents":[{"Add":" return serve_changelist(repo_path, &channel[0]);"}],"del_contents":[{"Del":" return serve_changelist(repo_path, channel);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":71,"ins":{"up_context":[{"change":2,"pos":4600}],"down_context":[{"change":2,"pos":4650}],"flag":"BLOCK","start":5112,"end":5197,"inode":{"change":2,"pos":2771}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4600},"to":{"change":2,"start":4600,"end":4650},"introduced_by":2}],"inode":{"change":2,"pos":2771}},"ins_contents":[{"Add":" if let Some(channel) = query.get(\"channel\")"},{"Add":" && !channel.is_empty()"},{"Add":" {"}],"del_contents":[{"Del":" if let Some(channel) = query.get(\"channel\") {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":75,"ins":{"up_context":[{"change":2,"pos":4688}],"down_context":[{"change":2,"pos":4745}],"flag":"BLOCK","start":5198,"end":5259,"inode":{"change":2,"pos":2771}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4688},"to":{"change":2,"start":4688,"end":4745},"introduced_by":2}],"inode":{"change":2,"pos":2771}},"ins_contents":[{"Add":" return serve_channel_id(repo_path, &channel[0]);"}],"del_contents":[{"Del":" return serve_channel_id(repo_path, channel);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":77,"ins":{"up_context":[{"change":2,"pos":4755}],"down_context":[{"change":2,"pos":4805}],"flag":"BLOCK","start":5260,"end":5314,"inode":{"change":2,"pos":2771}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4755},"to":{"change":2,"start":4755,"end":4805},"introduced_by":2}],"inode":{"change":2,"pos":2771}},"ins_contents":[{"Add":" return serve_channel(repo_path, &channel[0]);"}],"del_contents":[{"Del":" return serve_channel(repo_path, channel);\n"}]}},{"Edit":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":99,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5159},"to":{"change":2,"start":5159,"end":5218},"introduced_by":2}],"inode":{"change":2,"pos":2771}}},"contents":[{"Del":"/* ---------------- protocol handlers ---------------- */\n\n"}]}},{"Edit":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":183,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7919},"to":{"change":2,"start":7919,"end":7920},"introduced_by":2}],"inode":{"change":2,"pos":2771}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":2,"pos":2771},"path":"src/bin/main.rs","line":214,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":9068},"to":{"change":2,"start":9068,"end":9069},"introduced_by":2}],"inode":{"change":2,"pos":2771}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":2,"pos":9128},"path":"benches/parse_url.rs","line":1,"ins":{"up_context":[{"change":2,"pos":9128}],"down_context":[{"change":2,"pos":9216}],"flag":"BLOCK","start":5315,"end":5376,"inode":{"change":2,"pos":9128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":9128},"to":{"change":2,"start":9129,"end":9216},"introduced_by":2}],"inode":{"change":2,"pos":9128}},"ins_contents":[{"Add":"use criterion::{Criterion, criterion_group, criterion_main};"}],"del_contents":[{"Del":"use criterion::{criterion_group, criterion_main, Criterion};\nuse std::hint::black_box;\n"}]}},{"Edit":{"inode":{"change":2,"pos":9128},"path":"benches/parse_url.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":9247}],"down_context":[{"change":2,"pos":9247}],"flag":"BLOCK","start":5377,"end":5403,"inode":{"change":2,"pos":9128}}},"contents":[{"Add":"use std::hint::black_box;"}]}}],"owner":"tetov","repo":"pijul-srv-lite","token":"eEgYVnlNxgVNNWM4hatjfXLtBnGO9cT4mhyK0EfEKZA=","login":null}

…

Dependencies

Change contents