extract recorder to seperate crate in crates/

Author: e1732a364fed

Cargo.lock

@@ -25,6 +25,7 @@ members = [
   "crates/ruci-cmd",
   "crates/ruci-rustls22",
   "crates/ruci-rustls21",
+  "crates/ruci-recorder",
 ]
 
 [workspace.dependencies]
@@ -60,6 +61,8 @@ reqwest = { version = "0.12", default-features = false, features = [
 ] }
 
 toml = "0.8"
+chrono = { version = "0.4", features = ["serde"] }
+serde_json = "1.0"
 
 
 [dependencies]

Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "ruci-recorder"
+version = "0.0.1"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+ruci = { path = "../.." }
+macro_map = { path = "../macro_map" }
+tracing = { workspace = true }
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+chrono = { workspace = true }
+futures = { workspace = true }
+pin-project = { workspace = true }
+
+serde_cbor = { version = "0.11" }
+har = { version = "0.8.1" }

crates/ruci-recorder/Cargo.toml

@@ -728,7 +728,7 @@ impl From<InfoData> for har::Har {
             log: har::Spec::V1_2(har::v1_2::Log {
                 creator: har::v1_2::Creator {
                     name: "ruci".to_string(),
-                    version: crate::VERSION.to_string(),
+                    version: ruci::VERSION.to_string(),
                     comment: None,
                 },
 

rucimp/src/map/recorder/mod.rs crates/ruci-recorder/src/lib.rsrucimp/src/map/recorder/mod.rs renamed to crates/ruci-recorder/src/lib.rs

@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 ruci = { path = ".." }
 macro_map = { path = "../crates/macro_map" }
+ruci-recorder = { path = "../crates/ruci-recorder" }
 ruci-rustls22 = { path = "../crates/ruci-rustls22" }
 ruci-rustls21 = { path = "../crates/ruci-rustls21", optional = true }
 user_trait = { workspace = true }
@@ -32,10 +33,9 @@ utoipa = { workspace = true, optional = true }
 reqwest = { workspace = true }
 utoipa-swagger-ui = { version = "9", optional = true, features = ["axum"] }
 
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { workspace = true }
 
-serde_json = "1.0"
-serde_cbor = "0.11"
+serde_json = { workspace = true }
 serde_path_to_error = "0.1"
 
 strum = "0.27"
@@ -47,13 +47,16 @@ base64 = "0.22"
 itertools = "0.14"
 thiserror = "2"
 
-
-ipnet = { version = "2" }
-iprange = { version = "0.6" }
-regex = { version = "1" }
 clash_rules = "0.1.19"
 geosite-rs = "0.1.6"
 
+
+http = "1.1"
+tokio-tungstenite = "0.21"
+h2 = { version = "0.4" }
+hpack = "0.3"
+
+
 mlua = { version = "0.10", features = [
   "serialize",
   "async",
@@ -72,11 +75,6 @@ rlimit = { version = "0.10", optional = true }
 native-tls = { version = "0.2", features = ["alpn"], optional = true }
 tokio-native-tls = { version = "0.3", optional = true }
 
-http = "1.1"
-tokio-tungstenite = "0.21"
-h2 = { version = "0.4" }
-hpack = "0.3"
-
 
 quinn = { version = "0.10", optional = true }
 
@@ -108,8 +106,6 @@ md5 = "0.7"
 zip = "2.2"
 
 
-har = "0.8.1"
-
 TinyUFO = { version = "0.1", optional = true }
 
 
@@ -135,32 +131,29 @@ wiremock = "0.6"
 
 [features]
 default = ["sockopt"]
+
+trace = ["ruci/trace"]
+
 steganography = []
 api_server = ["axum", "tower-http", "TinyUFO", "utoipa", "utoipa-swagger-ui"]
 file_server = ["axum", "tower-http"]
 
 # quic = ["s2n-quic", "s2n-quic-rustls", "ruci-rustls21"]
 quinn = ["ruci-rustls21", "dep:quinn"]
 
-trace = ["ruci/trace"]
 
 lua = ["mlua/luau", "serde-lua-table", "rustyline"]
 lua54 = ["mlua/lua54", "mlua/vendored", "serde-lua-table", "rustyline"]
 
-# route = ["ipnet", "iprange", "regex"]
-
 sockopt = ["libc", "socket2", "rlimit"]
 
 use-native-tls = ["native-tls", "tokio-native-tls"]
-
 native-tls-vendored = ["native-tls/vendored", "tokio-native-tls/vendored"]
 
 
 lwip = ["netstack-lwip"]
 smoltcp = ["netstack-smoltcp"]
 
-# smoltcp = ["dep:smoltcp", "netstack-smoltcp"]
-
 
 [[example]]
 name = "lua"

rucimp/src/map/recorder/tcp.rs crates/ruci-recorder/src/tcp.rsrucimp/src/map/recorder/tcp.rs renamed to crates/ruci-recorder/src/tcp.rs

@@ -4,7 +4,6 @@ Defines some [`ruci::map::Map`]s.
 
 pub mod h2;
 pub mod quic_common;
-pub mod recorder;
 pub mod ws;
 
 #[cfg(feature = "steganography")]

rucimp/Cargo.toml

@@ -15,7 +15,7 @@ use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio::sync::mpsc::{self, Receiver, Sender};
 use tracing::{debug, info};
 
-use crate::map::recorder::{PayloadInfo, READ_DIRECTION, WRITE_DIRECTION};
+use ruci_recorder::{PayloadInfo, READ_DIRECTION, WRITE_DIRECTION};
 
 pub const WRTIE_IS_STEGO: u8 = 0;
 pub const WRTIE_IS_REAL: u8 = 1;
@@ -36,12 +36,12 @@ impl Embedder {
         let extension = ext.as_str();
 
         let extension = match extension {
-            "json" => crate::map::recorder::OutputFileExtension::Json,
-            "cbor" => crate::map::recorder::OutputFileExtension::Cbor,
+            "json" => ruci_recorder::OutputFileExtension::Json,
+            "cbor" => ruci_recorder::OutputFileExtension::Cbor,
             _ => anyhow::bail!("invalid file extension: {}", extension),
         };
 
-        let info_data = crate::map::recorder::InfoData::new(file_content, extension)?;
+        let info_data = ruci_recorder::InfoData::new(file_content, extension)?;
         Ok(Self {
             file: Arc::new(info_data.payload),
             ext_fields: Default::default(),

rucimp/src/map/mod.rs

@@ -43,10 +43,7 @@ use ruci::{
 use serde::{Deserialize, Serialize};
 use tracing::warn;
 
-use crate::{
-    map::{recorder, ws},
-    utils::init_tls_server_pem_option,
-};
+use crate::{map::ws, utils::init_tls_server_pem_option};
 use data_source::{DataSource, SyncFolderSource};
 
 #[cfg(feature = "steganography")]
@@ -383,7 +380,7 @@ pub enum InMapConfig {
         value: i8,
     },
     Counter,
-    Recorder(recorder::Config),
+    Recorder(ruci_recorder::Config),
     TLS(ruci::map::tls_config::ServerOptions),
 
     #[cfg(any(feature = "use-native-tls", feature = "native-tls-vendored"))]
@@ -405,10 +402,9 @@ pub enum InMapConfig {
     #[cfg(feature = "quinn")]
     Quic(crate::map::quic_common::ServerConfig),
 
-    /// tcp/ip stack
+    // tcp/ip stack
     // #[cfg(feature = "smoltcp")]
     // Stack2,
-
     #[cfg(feature = "smoltcp")]
     StackSmoltcp,
     #[cfg(feature = "lwip")]
@@ -446,7 +442,7 @@ pub enum OutMapConfig {
         value: i8,
     },
     Counter,
-    Recorder(recorder::Config),
+    Recorder(ruci_recorder::Config),
     TLS(ruci::map::tls_config::ClientOptions),
 
     #[cfg(feature = "sockopt")]