refactor: adjust pingap workspace member

Author: vicanso

Cargo.lock

@@ -19,35 +19,23 @@ default-run = "pingap"
 ahash = { version = "0.8.11", default-features = false }
 arc-swap = "1.7.1"
 async-trait = "0.1.86"
-base64 = "0.22.1"
-bstr = "1.11.3"
 bytes = "1.9.0"
-bytesize = { version = "1.3.0", features = ["serde"] }
 cfg-if = "1.0.0"
-chrono = { version = "0.4.39", default-features = false, features = [
-    "std",
-    "clock",
-] }
 clap = { version = "4.5.28", features = [
     "derive",
     "std",
     "help",
     "usage",
 ], default-features = false }
-cookie = "0.18.1"
 crc32fast = "1.4.2"
 crossbeam-channel = "0.5.14"
-fancy-regex = "0.14.0"
 flate2 = "1.0.35"
 glob = "0.3.2"
 hex = "0.4.3"
-hmac-sha256 = "1.1.8"
-hmac-sha512 = { version = "1.1.6", default-features = false }
 http = "1.2.0"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
 itoa = "1.0.14"
-mime_guess = "2.0.5"
 nanoid = "0.4.0"
 nix = { version = "0.29.0", features = ["signal"] }
 num_cpus = "1.16.0"
@@ -62,7 +50,6 @@ pingora = { git = "https://github.com/cloudflare/pingora", rev = "e6b823c5d89860
     "openssl",
     "cache",
 ] }
-pingora-limits = "0.4.0"
 regex = { version = "1.11.1", default-features = false }
 rust-embed = { version = "8.5.0", features = [
     "mime-guess",
@@ -72,7 +59,6 @@ scopeguard = "1.2.0"
 serde = "1.0.217"
 serde_json = "1.0.138"
 sha2 = { version = "0.10.8", default-features = false }
-smallvec = "1.13.2"
 snafu = { version = "0.8.5", features = ["std"], default-features = false }
 substring = "1.4.5"
 tokio = { version = "1.43.0", default-features = false, features = ["fs"] }
@@ -103,6 +89,7 @@ pingap-plugin = { path = "pingap-plugin" }
 pingap-otel = { path = "pingap-otel", optional = true }
 pingap-sentry = { path = "pingap-sentry", optional = true }
 pingap-pyroscope = { path = "pingap-pyroscope", optional = true }
+ctor = "0.2.9"
 
 
 [features]

Cargo.toml

@@ -26,6 +26,7 @@ uuid = { version = "1.12.1", features = [
     "fast-rng",
 ], default-features = false }
 bstr = "1.11.3"
+fancy-regex = "0.14.0"
 url = { workspace = true }
 urlencoding = { workspace = true }
 bytesize = { workspace = true }
@@ -57,6 +58,7 @@ pingap-http-extra = { path = "../pingap-http-extra" }
 pingap-state = { path = "../pingap-state" }
 pingap-config = { path = "../pingap-config" }
 pingap-util = { path = "../pingap-util" }
+pingap-cache = { path = "../pingap-cache" }
 
 
 [dev-dependencies]

pingap-plugin/Cargo.toml

@@ -13,12 +13,13 @@
 // limitations under the License.
 
 use super::{
-    get_bool_conf, get_hash_key, get_str_conf, get_str_slice_conf, Error,
-    Plugin, Result,
+    get_bool_conf, get_hash_key, get_plugin_factory, get_str_conf,
+    get_str_slice_conf, Error, Plugin,
 };
 use async_trait::async_trait;
 use bytes::{BufMut, Bytes, BytesMut};
 use bytesize::ByteSize;
+use ctor::ctor;
 use fancy_regex::Regex;
 use http::{Method, StatusCode};
 use humantime::parse_duration;
@@ -36,9 +37,12 @@ use pingora::cache::lock::{CacheKeyLock, CacheLock};
 use pingora::cache::predictor::{CacheablePredictor, Predictor};
 use pingora::proxy::Session;
 use std::str::FromStr;
+use std::sync::Arc;
 use std::time::Duration;
 use tracing::{debug, error};
 
+type Result<T> = std::result::Result<T, Error>;
+
 // Maximum memory size for cache (100MB) - default if not configured otherwise
 const MAX_MEMORY_SIZE: usize = 100 * 1024 * 1024;
 
@@ -447,11 +451,16 @@ impl Plugin for Cache {
     }
 }
 
+#[ctor]
+fn init() {
+    get_plugin_factory()
+        .register("cache", |params| Ok(Arc::new(Cache::new(params)?)));
+}
+
 #[cfg(test)]
 mod tests {
-    use super::Cache;
+    use super::*;
     use pingap_config::{PluginConf, PluginStep};
-    use pingap_plugin::Plugin;
     use pingap_state::Ctx;
     use pingora::proxy::Session;
     use pretty_assertions::assert_eq;

src/plugin/cache.rs pingap-plugin/src/cache.rs

@@ -33,6 +33,16 @@ pub enum Error {
         max: isize,
         value: isize,
     },
+    #[snafu(display("Plugin {category}, regex error {source}"))]
+    Regex {
+        category: String,
+        source: Box<fancy_regex::Error>,
+    },
+    #[snafu(display("Plugin {category}, base64 decode error {source}"))]
+    ParseDuration {
+        category: String,
+        source: humantime::DurationError,
+    },
 }
 
 /// Helper functions for accessing plugin configuration values
@@ -110,6 +120,7 @@ pub(crate) fn get_hash_key(conf: &PluginConf) -> String {
 
 mod accept_encoding;
 mod basic_auth;
+mod cache;
 mod combined_auth;
 mod compression;
 mod cors;

pingap-plugin/src/lib.rs

@@ -13,13 +13,13 @@
 // limitations under the License.
 
 use super::{
-    get_hash_key, get_int_conf, get_str_conf, get_str_slice_conf, Error,
-    Plugin, Result,
+    get_hash_key, get_int_conf, get_str_conf, get_str_slice_conf, Plugin,
 };
 use crate::process::{get_start_time, restart_now};
 use async_trait::async_trait;
 use bytes::Bytes;
 use bytes::{BufMut, BytesMut};
+use ctor::ctor;
 use flate2::write::GzEncoder;
 use flate2::Compression;
 use hex::encode;
@@ -42,6 +42,7 @@ use pingap_http_extra::HttpResponse;
 use pingap_limit::TtlLruLimit;
 use pingap_performance::get_process_system_info;
 use pingap_performance::get_processing_accepted;
+use pingap_plugin::{get_plugin_factory, Error};
 use pingap_state::Ctx;
 use pingap_util::base64_decode;
 use pingora::http::RequestHeader;
@@ -53,11 +54,14 @@ use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::collections::HashMap;
 use std::io::Write;
+use std::sync::Arc;
 use std::time::Duration;
 use substring::Substring;
 use tracing::{debug, error};
 use urlencoding::decode;
 
+type Result<T> = std::result::Result<T, Error>;
+
 #[derive(RustEmbed)]
 #[folder = "dist/"]
 struct AdminAsset;
@@ -671,6 +675,12 @@ impl Plugin for AdminServe {
     }
 }
 
+#[ctor]
+fn init() {
+    get_plugin_factory()
+        .register("admin", |params| Ok(Arc::new(AdminServe::new(params)?)));
+}
+
 #[cfg(test)]
 mod tests {
     use super::{AdminAsset, AdminServe, EmbeddedStaticFile};