From 498849745ab493dad8214cd4a241fd45830bf6db Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 13:31:48 -0500 Subject: [PATCH] Reuse shared Base64 for control responses --- Cargo.lock | 36 +++++++++++++++++++++++++++++ Cargo.toml | 1 + crates/ui-egui/Cargo.toml | 1 + crates/ui-egui/src/control.rs | 20 ++-------------- crates/ui-egui/src/control/tests.rs | 16 +++++++++++++ 5 files changed, 56 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d02878c5..bdf8af71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1073,6 +1073,11 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-codepage" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=ea24422ae9859dc5da398d0462bc87f8e02e0d10#ea24422ae9859dc5da398d0462bc87f8e02e0d10" + [[package]] name = "craft-docpath" version = "0.1.0" @@ -1124,6 +1129,16 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-mime" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=ea24422ae9859dc5da398d0462bc87f8e02e0d10#ea24422ae9859dc5da398d0462bc87f8e02e0d10" +dependencies = [ + "chrono", + "craft-codepage", + "encoding_rs", +] + [[package]] name = "craft-scraft-format" version = "0.1.0" @@ -1548,6 +1563,20 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "encoding_rs" +version = "0.8.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89253175e704ab869b04f9db224d38630e0211a53841a79181deae0889e169f5" +dependencies = [ + "cfg-if", + "core_detect", + "multiversion_no_op", + "rustversion", + "scopeguard", + "simdutf8", +] + [[package]] name = "endi" version = "1.1.1" @@ -2751,6 +2780,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "multiversion_no_op" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" + [[package]] name = "naga" version = "30.0.1" @@ -4566,6 +4601,7 @@ name = "soundcraft-ui-egui" version = "0.20.1" dependencies = [ "craft-audio", + "craft-mime", "craft-ui", "craft-update", "egui", diff --git a/Cargo.toml b/Cargo.toml index fa0c1dee..192fde9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ rust-version = "1.95" repository = "https://github.com/storytold/soundcraft" [workspace.dependencies] +craft-mime = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "ea24422ae9859dc5da398d0462bc87f8e02e0d10" } # internal soundcraft-time = { path = "crates/time" } soundcraft-midi = { path = "crates/midi" } diff --git a/crates/ui-egui/Cargo.toml b/crates/ui-egui/Cargo.toml index 51d9e6bd..971c7fad 100644 --- a/crates/ui-egui/Cargo.toml +++ b/crates/ui-egui/Cargo.toml @@ -8,6 +8,7 @@ rust-version = "1.95" repository.workspace = true [dependencies] +craft-mime.workspace = true craft-ui.workspace = true soundcraft-time.workspace = true craft-audio.workspace = true diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs index e61a02ef..fa180245 100644 --- a/crates/ui-egui/src/control.rs +++ b/crates/ui-egui/src/control.rs @@ -824,24 +824,8 @@ fn encode(img: &egui::ColorImage, path: Option<&str>, token: u64) -> Value { } } -/// Minimal base64 (standard alphabet) to avoid another dependency. -pub fn base64(data: &[u8]) -> String { - const T: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - let mut out = String::with_capacity(data.len().div_ceil(3) * 4); - for chunk in data.chunks(3) { - let b = [chunk.first().copied().unwrap_or(0), chunk.get(1).copied().unwrap_or(0), chunk.get(2).copied().unwrap_or(0)]; - let n = (u32::from(b[0]) << 16) | (u32::from(b[1]) << 8) | u32::from(b[2]); - for i in 0..4 { - if i <= chunk.len() { - let idx = ((n >> (18 - 6 * i)) & 63) as usize; - out.push(char::from(T.get(idx).copied().unwrap_or(b'A'))); - } else { - out.push('='); - } - } - } - out -} +/// Standard padded Base64 without line wrapping, shared across Craft apps. +pub use craft_mime::transfer::base64; #[cfg(test)] mod tests; diff --git a/crates/ui-egui/src/control/tests.rs b/crates/ui-egui/src/control/tests.rs index 1f188327..e12545ff 100644 --- a/crates/ui-egui/src/control/tests.rs +++ b/crates/ui-egui/src/control/tests.rs @@ -899,3 +899,19 @@ fn scroll_reports_the_wheel_and_trackpad_sources_after_delivery() { let v = reply.try_recv().expect("trackpad scroll replies after its events were applied"); assert_eq!(v["result"]["source"], "trackpad"); } + +#[test] +fn shared_base64_retains_control_wire_bytes() { + assert_eq!(super::base64(b""), ""); + assert_eq!(super::base64(b"f"), "Zg=="); + assert_eq!(super::base64(b"fo"), "Zm8="); + assert_eq!(super::base64(b"foo"), "Zm9v"); + assert_eq!(super::base64(&[251, 255, 255]), "+///"); + let bytes: Vec = (0..=255).cycle().take(513).collect(); + for len in 0..=bytes.len() { + let encoded = super::base64(&bytes[..len]); + assert_eq!(encoded.len(), len.div_ceil(3) * 4); + assert!(!encoded.contains(['\r', '\n'])); + assert_eq!(craft_mime::base64::STANDARD.decode(&encoded).unwrap(), bytes[..len]); + } +}