Add proxy configuration support to ApiTarget and PageTarget

components/retrack-types/src/trackers.rs

@@ -22,8 +22,8 @@ pub use self::{
     tracker_list_revisions_params::TrackerListRevisionsParams,
     tracker_target::{
         ApiTarget, ConfiguratorScriptArgs, ConfiguratorScriptRequest, ConfiguratorScriptResult,
-        ExtractorEngine, ExtractorScriptArgs, ExtractorScriptResult, PageTarget, TargetRequest,
-        TargetResponse, TrackerTarget,
+        ExtractorEngine, ExtractorScriptArgs, ExtractorScriptResult, PageTarget, ProxyConfig,
+        ProxyCredentials, TargetRequest, TargetResponse, TrackerTarget,
     },
     tracker_update_params::TrackerUpdateParams,
     trackers_list_params::TrackersListParams,
@@ -61,6 +61,7 @@ pub mod tests {
                         engine: None,
                         user_agent: Some("Retrack/1.0.0".to_string()),
                         accept_invalid_certificates: false,
+                proxy: None,
                     }),
                     config: TrackerConfig {
                         revisions,

components/retrack-types/src/trackers/tracker.rs

@@ -59,6 +59,7 @@ mod tests {
             engine: Some(ExtractorEngine::Chromium),
             user_agent: Some("Retrack/2.0.0".to_string()),
             accept_invalid_certificates: true,
+            proxy: None,
         }))
         .build();
         assert_json_snapshot!(tracker, @r###"
@@ -104,6 +105,7 @@ mod tests {
             engine: None,
             user_agent: Some("Retrack/2.0.0".to_string()),
             accept_invalid_certificates: true,
+            proxy: None,
         }))
         .with_schedule("0 0 * * *")
         .build();
@@ -147,6 +149,7 @@ mod tests {
             engine: None,
             user_agent: Some("Retrack/2.0.0".to_string()),
             accept_invalid_certificates: true,
+            proxy: None,
         }))
         .with_schedule("0 0 * * *")
         .build();
@@ -190,6 +193,7 @@ mod tests {
             engine: Some(ExtractorEngine::Camoufox),
             user_agent: Some("Retrack/2.0.0".to_string()),
             accept_invalid_certificates: true,
+            proxy: None,
         }))
         .with_schedule("0 0 * * *")
         .build();
@@ -237,6 +241,7 @@ mod tests {
             engine: None,
             user_agent: Some("Retrack/2.0.0".to_string()),
             accept_invalid_certificates: true,
+            proxy: None,
         }))
         .with_schedule("0 0 * * *")
         .with_job_config(SchedulerJobConfig {

components/retrack-types/src/trackers/tracker_create_params.rs

@@ -54,6 +54,7 @@ mod tests {
                 engine: None,
                 user_agent: None,
                 accept_invalid_certificates: false,
+                proxy: None,
             }),
             config: Default::default(),
             tags: vec![],
@@ -85,6 +86,7 @@ mod tests {
                 params: None,
                 user_agent: None,
                 accept_invalid_certificates: false,
+                proxy: None,
             }),
             config: TrackerConfig {
                 revisions: 10,
@@ -119,6 +121,7 @@ mod tests {
                 engine: None,
                 user_agent: None,
                 accept_invalid_certificates: false,
+                proxy: None,
             }),
             config: TrackerConfig {
                 revisions: 3,
@@ -155,6 +158,7 @@ mod tests {
                 engine: Some(ExtractorEngine::Chromium),
                 user_agent: Some("Retrack/1.0.0".to_string()),
                 accept_invalid_certificates: true,
+                proxy: None,
             }),
             config: TrackerConfig {
                 revisions: 3,
@@ -225,6 +229,7 @@ mod tests {
                     engine: None,
                     user_agent: None,
                     accept_invalid_certificates: false,
+                proxy: None,
                 }),
                 config: Default::default(),
                 tags: vec![],
@@ -257,6 +262,7 @@ mod tests {
                     engine: None,
                     user_agent: None,
                     accept_invalid_certificates: false,
+                proxy: None,
                 }),
                 config: TrackerConfig {
                     revisions: 10,
@@ -293,6 +299,7 @@ mod tests {
                     engine: None,
                     user_agent: None,
                     accept_invalid_certificates: false,
+                proxy: None,
                 }),
                 config: TrackerConfig {
                     revisions: 3,
@@ -345,6 +352,7 @@ mod tests {
                     engine: Some(ExtractorEngine::Chromium),
                     user_agent: Some("Retrack/1.0.0".to_string()),
                     accept_invalid_certificates: true,
+                proxy: None,
                 }),
                 config: TrackerConfig {
                     revisions: 3,

components/retrack-types/src/trackers/tracker_target.rs

@@ -1,12 +1,14 @@
 mod api_target;
 mod page_target;
+mod proxy_config;
 
 pub use self::{
     api_target::{
         ApiTarget, ConfiguratorScriptArgs, ConfiguratorScriptRequest, ConfiguratorScriptResult,
         ExtractorScriptArgs, ExtractorScriptResult, TargetRequest, TargetResponse,
     },
     page_target::{ExtractorEngine, PageTarget},
+    proxy_config::{ProxyConfig, ProxyCredentials},
 };
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
@@ -26,7 +28,7 @@ pub enum TrackerTarget {
 #[cfg(test)]
 mod tests {
     use super::TrackerTarget;
-    use crate::trackers::{ApiTarget, ExtractorEngine, PageTarget, TargetRequest};
+    use crate::trackers::{ApiTarget, ExtractorEngine, PageTarget, ProxyConfig, ProxyCredentials, TargetRequest};
     use http::{
         Method,
         header::{AUTHORIZATION, CONTENT_TYPE},
@@ -42,6 +44,7 @@ mod tests {
             engine: None,
             user_agent: None,
             accept_invalid_certificates: false,
+            proxy: None,
         });
         let target_json = json!({
             "type": "page",
@@ -59,6 +62,7 @@ mod tests {
             engine: Some(ExtractorEngine::Camoufox),
             user_agent: Some("Retrack/1.0.0".to_string()),
             accept_invalid_certificates: true,
+            proxy: None,
         });
         let target_json = json!({
             "type": "page",
@@ -78,6 +82,7 @@ mod tests {
             requests: vec![TargetRequest::new("https://retrack.dev/".parse()?)],
             configurator: None,
             extractor: None,
+            proxy: None,
         });
         let target_json = json!({ "type": "api", "requests": [{ "url": "https://retrack.dev/" }] });
         assert_eq!(serde_json::to_value(&target)?, target_json);
@@ -93,6 +98,7 @@ mod tests {
             }],
             configurator: None,
             extractor: None,
+            proxy: None,
         });
         let target_json = json!({ "type": "api", "requests": [{ "url": "https://retrack.dev/", "method": "PUT" }] });
         assert_eq!(serde_json::to_value(&target)?, target_json);
@@ -117,6 +123,7 @@ mod tests {
             }],
             configurator: None,
             extractor: None,
+            proxy: None,
         });
         let target_json = json!({
             "type": "api",
@@ -132,6 +139,61 @@ mod tests {
             target
         );
 
+        // Test PageTarget with proxy
+        let target = TrackerTarget::Page(PageTarget {
+            extractor: "export async function execute(p) { await p.goto('https://retrack.dev/'); return await p.content(); }".to_string(),
+            params: None,
+            engine: None,
+            user_agent: None,
+            accept_invalid_certificates: false,
+            proxy: Some(ProxyConfig {
+                url: "http://proxy.example.com:8080".parse()?,
+                credentials: Some(ProxyCredentials {
+                    scheme: "Basic".to_string(),
+                    value: "dXNlcjpwYXNz".to_string(),
+                }),
+            }),
+        });
+        let target_json = json!({
+            "type": "page",
+            "extractor": "export async function execute(p) { await p.goto('https://retrack.dev/'); return await p.content(); }",
+            "proxy": {
+                "url": "http://proxy.example.com:8080/",
+                "credentials": {
+                    "scheme": "Basic",
+                    "value": "dXNlcjpwYXNz"
+                }
+            }
+        });
+        assert_eq!(serde_json::to_value(&target)?, target_json);
+        assert_eq!(
+            serde_json::from_value::<TrackerTarget>(target_json)?,
+            target
+        );
+
+        // Test ApiTarget with proxy
+        let target = TrackerTarget::Api(ApiTarget {
+            requests: vec![TargetRequest::new("https://retrack.dev/".parse()?)],
+            configurator: None,
+            extractor: None,
+            proxy: Some(ProxyConfig {
+                url: "http://proxy.example.com:8080".parse()?,
+                credentials: None,
+            }),
+        });
+        let target_json = json!({
+            "type": "api",
+            "requests": [{ "url": "https://retrack.dev/" }],
+            "proxy": {
+                "url": "http://proxy.example.com:8080/"
+            }
+        });
+        assert_eq!(serde_json::to_value(&target)?, target_json);
+        assert_eq!(
+            serde_json::from_value::<TrackerTarget>(target_json)?,
+            target
+        );
+
         Ok(())
     }
 }

components/retrack-types/src/trackers/tracker_target/api_target.rs

@@ -1,3 +1,4 @@
+use super::ProxyConfig;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use utoipa::ToSchema;
@@ -31,6 +32,9 @@ pub struct ApiTarget {
 
     /// Optional custom script (Deno) to extract only necessary data from the API response.
     pub extractor: Option<String>,
+
+    /// Optional proxy configuration.
+    pub proxy: Option<ProxyConfig>,
 }
 
 #[cfg(test)]
@@ -50,6 +54,7 @@ mod tests {
             requests: vec![TargetRequest::new(Url::parse("https://retrack.dev")?)],
             configurator: None,
             extractor: None,
+            proxy: None,
         };
         let target_json = json!({ "requests": [{ "url": "https://retrack.dev/" }] });
         assert_eq!(serde_json::to_value(&target)?, target_json);
@@ -62,6 +67,7 @@ mod tests {
             }],
             configurator: None,
             extractor: None,
+            proxy: None,
         };
         let target_json =
             json!({ "requests": [{"url": "https://retrack.dev/", "method": "PUT" }] });
@@ -84,6 +90,7 @@ mod tests {
             }],
             configurator: None,
             extractor: None,
+            proxy: None,
         };
         let target_json = json!({
             "requests": [{
@@ -115,6 +122,7 @@ mod tests {
             }],
             configurator: None,
             extractor: None,
+            proxy: None,
         };
         let target_json = json!({
             "requests": [{
@@ -152,6 +160,7 @@ mod tests {
             }],
             configurator: None,
             extractor: None,
+            proxy: None,
         };
         let target_json = json!({
             "requests": [{
@@ -195,6 +204,7 @@ mod tests {
                     .to_string(),
             ),
             extractor: None,
+            proxy: None,
         };
         let target_json = json!({
             "requests": [{
@@ -241,6 +251,7 @@ mod tests {
                 "((context) => ({ body: Deno.core.encode(JSON.stringify({ key: 'value' })) })();"
                     .to_string(),
             ),
+            proxy: None,
         };
         let target_json = json!({
             "requests": [{

components/retrack-types/src/trackers/tracker_target/page_target.rs

@@ -1,5 +1,6 @@
 mod extractor_engine;
 
+use super::ProxyConfig;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use utoipa::ToSchema;
@@ -28,6 +29,9 @@ pub struct PageTarget {
     /// Whether to ignore invalid server certificates when sending network requests.
     #[serde(default, skip_serializing_if = "std::ops::Not::not")]
     pub accept_invalid_certificates: bool,
+
+    /// Optional proxy configuration.
+    pub proxy: Option<ProxyConfig>,
 }
 
 #[cfg(test)]
@@ -48,6 +52,7 @@ mod tests {
             params: Some(json!({ "param": "value" })),
             user_agent: Some("Retrack/1.0.0".to_string()),
             accept_invalid_certificates: true,
+            proxy: None,
         };
         let target_json = json!({
             "extractor": "export async function execute(p) { await p.goto('https://retrack.dev/'); return await p.content(); }",