refactor: adjust pingap workspace member

pingap-state/Cargo.toml

@@ -22,6 +22,7 @@ itoa = { workspace = true }
 opentelemetry = { version = "0.27.1", default-features = false, features = [
     "trace",
 ], optional = true }
+tokio = { workspace = true }
 pingap-location = { path = "../pingap-location" }
 pingap-upstream = { path = "../pingap-upstream" }
 pingap-util = { path = "../pingap-util" }

src/http_extra/http_header.rs → pingap-state/src/http_header.rs

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use super::Ctx;
 use bytes::BytesMut;
 use http::HeaderValue;
-use pingap_state::Ctx;
 use pingap_util::get_hostname;
 use pingora::proxy::Session;
 
@@ -162,29 +162,11 @@ fn handle_context_value(buf: &[u8], ctx: &Ctx) -> Option<HeaderValue> {
 
 #[cfg(test)]
 mod tests {
-    use super::convert_header_value;
+    use super::*;
     use http::HeaderValue;
-    use pingap_http_extra::convert_headers;
-    use pingap_state::Ctx;
     use pingora::proxy::Session;
     use pretty_assertions::assert_eq;
     use tokio_test::io::Builder;
-    #[test]
-    fn test_convert_headers() {
-        let headers = convert_headers(&[
-            "Content-Type: application/octet-stream".to_string(),
-            "X-Server: $hostname".to_string(),
-            "X-User: $USER".to_string(),
-        ])
-        .unwrap();
-        assert_eq!(3, headers.len());
-        assert_eq!("content-type", headers[0].0.to_string());
-        assert_eq!("application/octet-stream", headers[0].1.to_str().unwrap());
-        assert_eq!("x-server", headers[1].0.to_string());
-        assert_eq!(false, headers[1].1.to_str().unwrap().is_empty());
-        assert_eq!("x-user", headers[2].0.to_string());
-        assert_eq!(false, headers[2].1.to_str().unwrap().is_empty());
-    }
 
     #[tokio::test]
     async fn test_convert_header_value() {

pingap-state/src/lib.rs

@@ -13,5 +13,7 @@
 // limitations under the License.
 
 mod ctx;
+mod http_header;
 
 pub use ctx::*;
+pub use http_header::*;

src/lib.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub mod http_extra;
 pub mod plugin;
+pub mod process;
 pub mod proxy;
-pub mod service;
-pub mod state;

src/main.rs

@@ -31,9 +31,11 @@ use pingap_upstream::{new_upstream_health_check_task, try_init_upstreams};
 use pingora::server;
 use pingora::server::configuration::Opt;
 use pingora::services::background::background_service;
+use process::{
+    get_admin_addr, get_start_time, new_auto_restart_service,
+    new_observer_service, set_admin_addr,
+};
 use proxy::{Server, ServerConf};
-use service::{new_auto_restart_service, new_observer_service};
-use state::{get_admin_addr, get_start_time, set_admin_addr};
 use std::collections::HashMap;
 use std::error::Error;
 use std::ffi::OsString;
@@ -42,12 +44,9 @@ use std::sync::Arc;
 use std::time::Duration;
 use tracing::{error, info};
 
-mod http_extra;
-
 mod plugin;
+mod process;
 mod proxy;
-mod service;
-mod state;
 
 static TEMPLATE_CONFIG: &str = r###"
 [basic]
@@ -379,7 +378,7 @@ fn run() -> Result<(), Box<dyn Error>> {
     info!("Enable feature perf");
 
     if let Ok(exec_path) = std::env::current_exe() {
-        let mut cmd = state::RestartProcessCommand {
+        let mut cmd = process::RestartProcessCommand {
             exec_path,
             ..Default::default()
         };
@@ -407,7 +406,7 @@ fn run() -> Result<(), Box<dyn Error>> {
             new_args.push("--autorestart".to_string());
         }
         cmd.args = new_args;
-        state::set_restart_process_command(cmd);
+        process::set_restart_process_command(cmd);
     }
 
     try_init_upstreams(&conf.upstreams)?;

src/plugin/admin.rs

@@ -16,8 +16,7 @@ use super::{
     get_hash_key, get_int_conf, get_str_conf, get_str_slice_conf, Error,
     Plugin, Result,
 };
-use crate::state::get_start_time;
-use crate::state::restart_now;
+use crate::process::{get_start_time, restart_now};
 use async_trait::async_trait;
 use bytes::Bytes;
 use bytes::{BufMut, BytesMut};

src/plugin/cors.rs

@@ -13,13 +13,12 @@
 // limitations under the License.
 
 use super::{get_bool_conf, get_hash_key, get_str_conf, Error, Plugin, Result};
-use crate::http_extra::convert_header_value;
 use async_trait::async_trait;
 use http::{header, HeaderValue};
 use humantime::parse_duration;
 use pingap_config::{PluginCategory, PluginConf, PluginStep};
 use pingap_http_extra::{HttpHeader, HttpResponse};
-use pingap_state::Ctx;
+use pingap_state::{convert_header_value, Ctx};
 use pingora::http::ResponseHeader;
 use pingora::proxy::Session;
 use regex::Regex;

src/plugin/mod.rs

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::process::get_admin_addr;
 use crate::proxy::ServerConf;
-use crate::state::get_admin_addr;
 use ahash::AHashMap;
 use arc_swap::ArcSwap;
 use async_trait::async_trait;

src/plugin/response_headers.rs

@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 use super::{get_hash_key, get_str_slice_conf, Error, Plugin, Result};
-use crate::http_extra::convert_header_value;
 use async_trait::async_trait;
 use http::header::HeaderName;
 use pingap_config::{PluginCategory, PluginConf, PluginStep};
 use pingap_http_extra::{convert_header, HttpHeader};
-use pingap_state::Ctx;
+use pingap_state::{convert_header_value, Ctx};
 use pingora::http::ResponseHeader;
 use pingora::proxy::Session;
 use std::str::FromStr;

src/plugin/stats.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use super::{get_hash_key, get_step_conf, get_str_conf, Error, Plugin, Result};
-use crate::state::get_start_time;
+use crate::process::get_start_time;
 use async_trait::async_trait;
 use bytes::Bytes;
 use pingap_config::{PluginCategory, PluginConf, PluginStep};

src/service/auto_restart.rs → src/process/auto_restart.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::state::restart;
+use crate::process::restart;
 use crate::{plugin, proxy};
 use async_trait::async_trait;
 use pingap_config::{

src/process/mod.rs

@@ -0,0 +1,7 @@
+mod auto_restart;
+mod common;
+
+pub const LOG_CATEGORY: &str = "process";
+
+pub use auto_restart::*;
+pub use common::*;

src/proxy/server.rs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 use super::{ServerConf, LOG_CATEGORY};
-use crate::http_extra::convert_header_value;
 use crate::plugin::{get_plugin, ADMIN_SERVER_PLUGIN};
 use ahash::AHashMap;
 use arc_swap::ArcSwap;
@@ -44,6 +43,7 @@ use pingap_performance::{
     new_prometheus, new_prometheus_push_service, Prometheus,
 };
 use pingap_service::SimpleServiceTaskFuture;
+use pingap_state::convert_header_value;
 #[cfg(feature = "full")]
 use pingap_state::OtelTracer;
 use pingap_state::{get_cache_key, CompressionStat, Ctx};