move contentviews and syntax highlighter into separate crates

Author: mhils

Cargo.lock

@@ -1,6 +1,8 @@
 [workspace]
 members = [
     ".",
+    "mitmproxy-contentviews",
+    "mitmproxy-highlight",
     "mitmproxy-rs",
     "mitmproxy-linux",
     "mitmproxy-linux-ebpf",
@@ -11,6 +13,8 @@ members = [
 ]
 default-members = [
     ".",
+    "mitmproxy-contentviews",
+    "mitmproxy-highlight",
     "mitmproxy-rs",
     "mitmproxy-linux",
     "mitmproxy-linux-ebpf-common",
@@ -68,15 +72,6 @@ internet-packet = { version = "0.2.3", features = ["smoltcp"] }
 data-encoding = "2.8.0"
 hickory-resolver = "0.25.1"
 socket2 = "0.5.9"
-serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.9"
-rmp-serde = "1.1"
-protobuf = "3.7.2"
-regex = "1.10.3"
-tree-sitter-highlight = "0.25.3"
-tree-sitter-yaml = "0.7.0"
-tree-sitter-xml = "0.7.0"
-tree-sitter = "0.25.3"
 
 [patch.crates-io]
 # tokio = { path = "../tokio/tokio" }
@@ -118,19 +113,10 @@ rand = "0.9"
 criterion = "0.5.1"
 hickory-server = "0.25.1"
 
-
 [[bench]]
 name = "process"
 harness = false
 
-[[bench]]
-name = "contentviews"
-harness = false
-
-[[bench]]
-name = "syntax_highlight"
-harness = false
-
 [profile.release]
 codegen-units = 1
 lto = true

Cargo.toml

@@ -21,6 +21,10 @@ This repository contains mitmproxy's Rust bits, most notably:
 ### Structure
 
 - [`src/`](./src): The `mitmproxy` crate containing most of the "meat".
+- [`mitmproxy-contentviews/`](./mitmproxy-contentviews): 
+  Pretty-printers for (HTTP) message bodies.
+- [`mitmproxy-highlight/`](./mitmproxy-highlight):
+  Syntax highlighting backend for mitmproxy and mitmdump.
 - [`mitmproxy-rs/`](./mitmproxy-rs): The `mitmproxy-rs` Python package,
   which provides Python bindings for the Rust crate using [PyO3](https://pyo3.rs/).  
   Source and binary distributions are available [on PyPI](https://pypi.org/project/mitmproxy-rs/).

README.md

@@ -0,0 +1,30 @@
+[package]
+name = "mitmproxy-contentviews"
+license = "MIT"
+authors.workspace = true
+version.workspace = true
+repository.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+publish.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow = { version = "1.0.97", features = ["backtrace"] }
+log = "0.4.27"
+pretty-hex = "0.4.1"
+mitmproxy-highlight = { path = "../mitmproxy-highlight" }
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.9"
+rmp-serde = "1.1"
+protobuf = "3.7.2"
+regex = "1.10.3"
+
+[dev-dependencies]
+criterion = "0.5.1"
+
+[[bench]]
+name = "contentviews"
+harness = false

mitmproxy-contentviews/Cargo.toml

@@ -1,17 +1,16 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use mitmproxy::contentviews;
-use mitmproxy::contentviews::{Prettify, Reencode, TestMetadata};
+use mitmproxy_contentviews::{MsgPack, Prettify, Protobuf, Reencode, TestMetadata};
 
 fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("protobuf-prettify", |b| {
         b.iter(|| {
-            contentviews::Protobuf.prettify(black_box(b"\n\x13gRPC testing server\x12\x07\n\x05Index\x12\x07\n\x05Empty\x12\x0c\n\nDummyUnary\x12\x0f\n\rSpecificError\x12\r\n\x0bRandomError\x12\x0e\n\x0cHeadersUnary\x12\x11\n\x0fNoResponseUnary"), &TestMetadata::default()).unwrap()
+            Protobuf.prettify(black_box(b"\n\x13gRPC testing server\x12\x07\n\x05Index\x12\x07\n\x05Empty\x12\x0c\n\nDummyUnary\x12\x0f\n\rSpecificError\x12\r\n\x0bRandomError\x12\x0e\n\x0cHeadersUnary\x12\x11\n\x0fNoResponseUnary"), &TestMetadata::default()).unwrap()
         })
     });
 
     c.bench_function("protobuf-reencode", |b| {
         b.iter(|| {
-            contentviews::Protobuf.reencode(
+            Protobuf.reencode(
                 black_box("1: gRPC testing server\n2:\n- 1: Index\n- 1: Empty\n- 1: DummyUnary\n- 1: SpecificError\n- 1: RandomError\n- 1: HeadersUnary\n- 1: NoResponseUnary\n"),
                 &TestMetadata::default()
             ).unwrap()
@@ -31,15 +30,15 @@ fn criterion_benchmark(c: &mut Criterion) {
     ];
     c.bench_function("msgpack-prettify", |b| {
         b.iter(|| {
-            contentviews::MsgPack
+            MsgPack
                 .prettify(black_box(TEST_MSGPACK), &TestMetadata::default())
                 .unwrap()
         })
     });
 
     c.bench_function("msgpack-reencode", |b| {
         b.iter(|| {
-            contentviews::MsgPack
+            MsgPack
                 .reencode(
                     black_box(
                         "\

benches/contentviews.rs …oxy-contentviews/benches/contentviews.rsbenches/contentviews.rs renamed to mitmproxy-contentviews/benches/contentviews.rs benches/contentviews.rs renamed to mitmproxy-contentviews/benches/contentviews.rs

@@ -1,5 +1,5 @@
-use crate::contentviews::{Metadata, Prettify, Protobuf, Reencode};
-use crate::syntax_highlight::Language;
+use crate::{Metadata, Prettify, Protobuf, Reencode};
+use mitmproxy_highlight::Language;
 use anyhow::{bail, Context, Result};
 use serde::Deserialize;
 use serde_yaml::Value;

src/contentviews/grpc.rs mitmproxy-contentviews/src/grpc.rssrc/contentviews/grpc.rs renamed to mitmproxy-contentviews/src/grpc.rs

@@ -1,5 +1,5 @@
-use crate::contentviews::hex_stream::is_binary;
-use crate::contentviews::{Metadata, Prettify};
+use crate::hex_stream::is_binary;
+use crate::{Metadata, Prettify};
 use pretty_hex::{HexConfig, PrettyHex};
 
 pub struct HexDump;
@@ -36,7 +36,7 @@ impl Prettify for HexDump {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::contentviews::TestMetadata;
+    use crate::TestMetadata;
 
     #[test]
     fn prettify_simple() {

src/contentviews/hex_dump.rs mitmproxy-contentviews/src/hex_dump.rssrc/contentviews/hex_dump.rs renamed to mitmproxy-contentviews/src/hex_dump.rs

@@ -1,4 +1,4 @@
-use crate::contentviews::{Metadata, Prettify, Reencode};
+use crate::{Metadata, Prettify, Reencode};
 use anyhow::{Context, Result};
 use pretty_hex::{HexConfig, PrettyHex};
 use std::num::ParseIntError;
@@ -64,7 +64,7 @@ impl Reencode for HexStream {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::contentviews::TestMetadata;
+    use crate::TestMetadata;
 
     #[test]
     fn test_hex_stream() {

src/contentviews/hex_stream.rs mitmproxy-contentviews/src/hex_stream.rssrc/contentviews/hex_stream.rs renamed to mitmproxy-contentviews/src/hex_stream.rs

@@ -6,7 +6,7 @@ mod protobuf;
 
 use anyhow::Result;
 
-use crate::syntax_highlight;
+use mitmproxy_highlight::Language;
 pub use grpc::GRPC;
 pub use hex_dump::HexDump;
 pub use hex_stream::HexStream;
@@ -24,8 +24,8 @@ pub trait Prettify: Send + Sync {
         self.name().to_lowercase().replace(" ", "_")
     }
 
-    fn syntax_highlight(&self) -> syntax_highlight::Language {
-        syntax_highlight::Language::None
+    fn syntax_highlight(&self) -> Language {
+        Language::None
     }
 
     fn prettify(&self, data: &[u8], metadata: &dyn Metadata) -> Result<String>;

src/contentviews/mod.rs mitmproxy-contentviews/src/lib.rssrc/contentviews/mod.rs renamed to mitmproxy-contentviews/src/lib.rs

@@ -1,8 +1,7 @@
-use crate::contentviews::{Metadata, Prettify, Reencode};
-use crate::syntax_highlight::Language;
+use super::{Metadata, Prettify, Reencode};
+use mitmproxy_highlight::Language;
 use anyhow::{Context, Result};
 use rmp_serde::{decode, encode};
-use serde_yaml;
 
 pub struct MsgPack;
 
@@ -41,7 +40,7 @@ impl Reencode for MsgPack {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::contentviews::TestMetadata;
+    use crate::TestMetadata;
 
     // Hardcoded MsgPack data for a simple object:
     // {