cleanup

ChristianPavilonis · ChristianPavilonis · commit 0095ea517f49 · 2025-11-10T18:19:59.000-06:00
diff --git a/crates/common/src/html_processor.rs b/crates/common/src/html_processor.rs
@@ -6,7 +6,6 @@ use std::rc::Rc;
 
 use lol_html::{element, html_content::ContentType, Settings as RewriterSettings};
 
-use crate::geo::GeoInfo;
 use crate::settings::Settings;
 use crate::streaming_processor::{HtmlRewriterAdapter, StreamProcessor};
 use crate::tsjs;
@@ -18,7 +17,6 @@ pub struct HtmlProcessorConfig {
     pub request_host: String,
     pub request_scheme: String,
     pub enable_prebid: bool,
-    pub geo_info: Option<GeoInfo>,
 }
 
 impl HtmlProcessorConfig {
@@ -28,28 +26,12 @@ impl HtmlProcessorConfig {
         origin_host: &str,
         request_host: &str,
         request_scheme: &str,
-        geo_info: Option<GeoInfo>,
     ) -> Self {
         Self {
             origin_host: origin_host.to_string(),
             request_host: request_host.to_string(),
             request_scheme: request_scheme.to_string(),
             enable_prebid: settings.prebid.auto_configure,
-            geo_info,
-        }
-    }
-
-    /// Generate JavaScript code to inject geo data into the page
-    fn geo_script_tag(geo_info: &GeoInfo) -> String {
-        // Serialize to JSON and embed in script tag
-        match serde_json::to_string(geo_info) {
-            Ok(json) => {
-                format!(r#"<script>window.__TS_GEO = {};</script>"#, json)
-            }
-            Err(e) => {
-                log::error!("Failed to serialize geo info: {}", e);
-                String::new()
-            }
         }
     }
 }
@@ -105,20 +87,11 @@ pub fn create_html_processor(config: HtmlProcessorConfig) -> impl StreamProcesso
 
     let rewriter_settings = RewriterSettings {
         element_content_handlers: vec![
-            // Inject tsjs and geo data once at the start of <head>
+            // Inject tsjs once at the start of <head>
             element!("head", {
                 let injected_tsjs = injected_tsjs.clone();
-                let geo_info = config.geo_info.clone();
                 move |el| {
                     if !injected_tsjs.get() {
-                        // Inject geo data first (if available)
-                        if let Some(ref geo) = geo_info {
-                            let geo_script = HtmlProcessorConfig::geo_script_tag(geo);
-                            if !geo_script.is_empty() {
-                                el.prepend(&geo_script, ContentType::Html);
-                            }
-                        }
-
                         // Then inject tsjs core script
                         let loader = tsjs::core_script_tag();
                         el.prepend(&loader, ContentType::Html);
@@ -266,19 +239,6 @@ mod tests {
             request_host: "test.example.com".to_string(),
             request_scheme: "https".to_string(),
             enable_prebid: false,
-            geo_info: None,
-        }
-    }
-
-    fn create_test_geo_info() -> GeoInfo {
-        GeoInfo {
-            city: "San Francisco".to_string(),
-            country: "US".to_string(),
-            continent: "North America".to_string(),
-            latitude: 37.7749,
-            longitude: -122.4194,
-            metro_code: 807,
-            region: Some("CA".to_string()),
         }
     }
 
@@ -400,7 +360,6 @@ mod tests {
             "origin.test-publisher.com",
             "proxy.example.com",
             "https",
-            None,
         );
 
         assert_eq!(config.origin_host, "origin.test-publisher.com");
@@ -409,67 +368,6 @@ mod tests {
         assert!(config.enable_prebid); // Uses default true
     }
 
-    #[test]
-    fn test_geo_data_injection() {
-        let html = r#"<html><head><title>Test</title></head><body>Content</body></html>"#;
-
-        let mut config = create_test_config();
-        config.geo_info = Some(create_test_geo_info());
-
-        let processor = create_html_processor(config);
-        let pipeline_config = PipelineConfig {
-            input_compression: Compression::None,
-            output_compression: Compression::None,
-            chunk_size: 8192,
-        };
-        let mut pipeline = StreamingPipeline::new(pipeline_config, processor);
-
-        let mut output = Vec::new();
-        let result = pipeline.process(Cursor::new(html.as_bytes()), &mut output);
-        assert!(result.is_ok());
-
-        let processed = String::from_utf8_lossy(&output);
-
-        // Check that geo data was injected
-        assert!(processed.contains("window.__trustedServerGeo"));
-        assert!(processed.contains(r#""city":"San Francisco""#));
-        assert!(processed.contains(r#""country":"US""#));
-        assert!(processed.contains(r#""latitude":37.7749"#));
-        assert!(processed.contains(r#""longitude":-122.4194"#));
-        assert!(processed.contains(r#""metro_code":807"#));
-        assert!(processed.contains(r#""region":"CA""#));
-
-        // Verify tsjs was still injected
-        assert!(processed.contains("/static/tsjs=tsjs-core.min.js"));
-    }
-
-    #[test]
-    fn test_no_geo_data_when_none() {
-        let html = r#"<html><head><title>Test</title></head><body>Content</body></html>"#;
-
-        let config = create_test_config(); // geo_info is None
-
-        let processor = create_html_processor(config);
-        let pipeline_config = PipelineConfig {
-            input_compression: Compression::None,
-            output_compression: Compression::None,
-            chunk_size: 8192,
-        };
-        let mut pipeline = StreamingPipeline::new(pipeline_config, processor);
-
-        let mut output = Vec::new();
-        let result = pipeline.process(Cursor::new(html.as_bytes()), &mut output);
-        assert!(result.is_ok());
-
-        let processed = String::from_utf8_lossy(&output);
-
-        // Should not contain geo data when none provided
-        assert!(!processed.contains("window.__trustedServerGeo"));
-
-        // But tsjs should still be injected
-        assert!(processed.contains("/static/tsjs=tsjs-core.min.js"));
-    }
-
     #[test]
     fn test_real_publisher_html() {
         // Test with publisher HTML from test_publisher.html
diff --git a/crates/common/src/publisher.rs b/crates/common/src/publisher.rs
@@ -8,7 +8,6 @@ use crate::http_util::serve_static_with_etag;
 use crate::constants::{HEADER_SYNTHETIC_TRUSTED_SERVER, HEADER_X_COMPRESS_HINT};
 use crate::cookies::create_synthetic_cookie;
 use crate::error::TrustedServerError;
-use crate::geo::GeoInfo;
 use crate::settings::Settings;
 use crate::streaming_processor::{Compression, PipelineConfig, StreamProcessor, StreamingPipeline};
 use crate::streaming_replacer::create_url_replacer;
@@ -106,7 +105,6 @@ struct ProcessResponseParams<'a> {
     request_scheme: &'a str,
     settings: &'a Settings,
     content_type: &'a str,
-    geo_info: Option<GeoInfo>,
 }
 
 /// Process response body in streaming fashion with compression preservation
@@ -131,7 +129,6 @@ fn process_response_streaming(
             params.request_host,
             params.request_scheme,
             params.settings,
-            params.geo_info,
         )?;
 
         let config = PipelineConfig {
@@ -174,16 +171,14 @@ fn create_html_stream_processor(
     request_host: &str,
     request_scheme: &str,
     settings: &Settings,
-    geo_info: Option<GeoInfo>,
 ) -> Result<impl StreamProcessor, Report<TrustedServerError>> {
     use crate::html_processor::{create_html_processor, HtmlProcessorConfig};
 
     let config = HtmlProcessorConfig::from_settings(
         settings,
         origin_host,
         request_host,
-        request_scheme,
-        geo_info,
+        request_scheme
     );
 
     Ok(create_html_processor(config))
@@ -232,17 +227,6 @@ pub fn handle_publisher_request(
 
     log::info!("Request host: {}, scheme: {}", request_host, request_scheme);
 
-    // Extract geo information from the request
-    let geo_info = GeoInfo::from_request(&req);
-    if let Some(ref geo) = geo_info {
-        log::info!(
-            "Geo info: city={}, country={}, metro_code={}",
-            geo.city,
-            geo.country,
-            geo.metro_code
-        );
-    }
-
     // Generate synthetic identifiers before the request body is consumed.
     let synthetic_id = get_or_generate_synthetic_id(settings, &req)?;
     let has_synthetic_cookie = req
@@ -320,7 +304,6 @@ pub fn handle_publisher_request(
             request_scheme: &request_scheme,
             settings,
             content_type: &content_type,
-            geo_info: geo_info.clone(),
         };
         match process_response_streaming(body, params) {
             Ok(processed_body) => {
diff --git a/crates/js/lib/src/geo/index.ts b/crates/js/lib/src/geo/index.ts
diff --git a/crates/js/lib/vite.config.ts b/crates/js/lib/vite.config.ts
@@ -3,7 +3,7 @@ import path from 'node:path';
 import { defineConfig } from 'vite';
 import type { Plugin } from 'vite';
 
-type BundleName = 'core' | 'ext' | 'creative' | 'geo';
+type BundleName = 'core' | 'ext' | 'creative';
 
 type BundleConfig = {
   input: string;
@@ -29,12 +29,6 @@ const BUNDLES: Record<BundleName, BundleConfig> = {
     fileName: 'tsjs-creative.js',
     name: 'tscreative',
   },
-
-  geo: {
-    input: path.resolve(__dirname, 'src/geo/index.ts'),
-    fileName: 'tsjs-geo.js',
-    name: 'tscreative',
-  },
 };
 
 function resolveBundleName(mode: string | undefined): BundleName {
