multi wit version handling for data-collection

Author: CLEMENTINATOR

crates/cli/src/commands/components/check.rs

@@ -4,6 +4,10 @@ use colored::Colorize;
 pub struct Options {
     #[arg(long = "filename")]
     filename: Option<String>,
+    #[arg(long = "component-type")]
+    component_type: Option<String>,
+    #[arg(long = "wit-version")]
+    wit_version: Option<String>,
 }
 
 pub enum ComponentType {
@@ -15,6 +19,7 @@ pub enum ComponentType {
 pub async fn check_component(
     component_type: ComponentType,
     component_path: &str,
+    component_wit_version: &str,
 ) -> anyhow::Result<()> {
     use edgee_components_runtime::config::{
         ComponentsConfiguration, ConsentMappingComponents, DataCollectionComponents,
@@ -29,13 +34,26 @@ pub async fn check_component(
     }
 
     let config = match component_type {
-        ComponentType::DataCollection => ComponentsConfiguration {
-            data_collection: vec![DataCollectionComponents {
-                id: component_path.to_string(),
-                file: component_path.to_string(),
+        ComponentType::DataCollection => match component_wit_version {
+            "0.5.0" => ComponentsConfiguration {
+                data_collection: vec![DataCollectionComponents {
+                    id: component_path.to_string(),
+                    file: component_path.to_string(),
+                    wit_version: edgee_components_runtime::data_collection::version::DataCollectionWitVersion::V0_5_0,
+                    ..Default::default()
+                }],
                 ..Default::default()
-            }],
-            ..Default::default()
+            },
+            "1.0.0" => ComponentsConfiguration {
+                data_collection: vec![DataCollectionComponents {
+                    id: component_path.to_string(),
+                    file: component_path.to_string(),
+                    wit_version: edgee_components_runtime::data_collection::version::DataCollectionWitVersion::V1_0_0,
+                    ..Default::default()
+                }],
+                ..Default::default()
+            },
+            _ => anyhow::bail!("Invalid WIT version: {}", component_wit_version),
         },
         ComponentType::ConsentMapping => ComponentsConfiguration {
             consent_mapping: vec![ConsentMappingComponents {
@@ -53,11 +71,19 @@ pub async fn check_component(
     let mut store = context.empty_store();
 
     match component_type {
-        ComponentType::DataCollection => {
-            let _ = context
-                .get_data_collection_instance(component_path, &mut store)
-                .await?;
-        }
+        ComponentType::DataCollection => match component_wit_version {
+            "0.5.0" => {
+                let _ = context
+                    .get_data_collection_0_5_0_instance(component_path, &mut store)
+                    .await?;
+            }
+            "1.0.0" => {
+                let _ = context
+                    .get_data_collection_instance(component_path, &mut store)
+                    .await?;
+            }
+            _ => anyhow::bail!("Invalid WIT version: {}", component_wit_version),
+        },
         ComponentType::ConsentMapping => {
             let _ = context
                 .get_consent_mapping_instance(component_path, &mut store)
@@ -74,9 +100,20 @@ pub async fn run(_opts: Options) -> anyhow::Result<()> {
 
     use crate::components::manifest::{self, Manifest};
 
-    let component_path = match _opts.filename {
-        Some(filename) => filename,
-        None => {
+    let (component_path, component_type, component_wit_version) = match (
+        _opts.filename,
+        _opts.component_type,
+        _opts.wit_version,
+    ) {
+        (Some(filename), Some(component_type), Some(version)) => match component_type.as_str() {
+            "data-collection" => (filename, ComponentType::DataCollection, version),
+            "consent-mapping" => (filename, ComponentType::ConsentMapping, version),
+            _ => anyhow::bail!(
+                "Invalid component type: {}, expected 'data-collection' or 'consent-mapping'",
+                component_type
+            ),
+        },
+        _ => {
             let Some(manifest_path) = manifest::find_manifest_path() else {
                 anyhow::bail!("Edgee Manifest not found. Please run `edgee component new` and start from a template or `edgee component init` to create a new empty manifest in this folder.");
             };
@@ -88,12 +125,20 @@ pub async fn run(_opts: Options) -> anyhow::Result<()> {
                 .output_path
                 .to_str()
                 .context("Output path should be a valid UTF-8 string")?;
-            component_path.to_string()
+            (
+                component_path.to_string(),
+                ComponentType::DataCollection,
+                manifest.component.wit_version,
+            )
         }
     };
 
-    // TODO: dont assume that it is a data collection component, add type in manifest
-    check_component(ComponentType::DataCollection, component_path.as_str()).await?;
+    check_component(
+        component_type,
+        component_path.as_str(),
+        component_wit_version.as_str(),
+    )
+    .await?;
 
     Ok(())
 }

crates/cli/src/commands/components/push.rs

@@ -85,8 +85,13 @@ pub async fn run(opts: Options) -> Result<()> {
 
     // check if the output file is a valid Data Collection component
     match super::check::check_component(
-        super::check::ComponentType::DataCollection,
+        match manifest.component.category {
+            api_types::ComponentCreateInputCategory::DataCollection => {
+                super::check::ComponentType::DataCollection
+            }
+        },
         output_path.to_str().unwrap(),
+        &manifest.component.wit_version,
     )
     .await
     {

crates/cli/src/commands/components/test.rs

@@ -7,8 +7,8 @@ use std::collections::HashMap;
 use edgee_components_runtime::data_collection;
 use std::str::FromStr;
 
-use edgee_components_runtime::data_collection::exports::edgee::components::data_collection::EdgeeRequest;
-use edgee_components_runtime::data_collection::exports::edgee::components::data_collection::HttpMethod;
+use edgee_components_runtime::data_collection::v1_0_0::data_collection::exports::edgee::components1_0_0::data_collection::EdgeeRequest;
+use edgee_components_runtime::data_collection::v1_0_0::data_collection::exports::edgee::components1_0_0::data_collection::HttpMethod;
 use edgee_components_runtime::data_collection::payload::{Event, EventType};
 use http::{HeaderMap, HeaderName, HeaderValue};
 #[derive(Debug, clap::Parser)]
@@ -118,7 +118,7 @@ async fn test_data_collection_component(opts: Options) -> anyhow::Result<()> {
     let instance = context
         .get_data_collection_instance(&component_path, &mut store)
         .await?;
-    let component = instance.edgee_components_data_collection();
+    let component = instance.edgee_components1_0_0_data_collection();
 
     // events generated with demo.edgee.app
     let page_event_json = r#"[{"uuid":"37009b9b-a572-4615-87c1-09e257331ecb","timestamp":"2025-02-03T15:46:39.283317613Z","type":"page","data":{"keywords":["demo","tag manager"],"title":"Page with Edgee components","url":"https://demo.edgee.app/analytics-with-edgee.html","path":"/analytics-with-edgee.html","referrer":"https://demo.edgee.dev/analytics-with-js.html"},"context":{"page":{"keywords":["demo","tag manager"],"title":"Page with Edgee components","url":"https://demo.edgee.app/analytics-with-edgee.html","path":"/analytics-with-edgee.html","referrer":"https://demo.edgee.dev/analytics-with-js.html"},"user":{"edgee_id":"6bb171d5-2284-41ee-9889-91af03b71dc5"},"client":{"ip":"127.0.0.1","locale":"en-us","accept_language":"en-US,en;q=0.9","timezone":"Europe/Paris","user_agent":"Mozilla/5.0 (X11; Linux x86_64)AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36","user_agent_version_list":"Not A(Brand;8|Chromium;132","user_agent_mobile":"0","os_name":"Linux","user_agent_architecture":"x86","user_agent_bitness":"64","user_agent_full_version_list":"Not A(Brand;8.0.0.0|Chromium;132.0.6834.159","user_agent_model":"","os_version":"6.12.11","screen_width":1920,"screen_height":1280,"screen_density":1.5},"session":{"session_id":"1738597536","session_count":1,"session_start":false,"first_seen":"2025-02-03T15:45:36.569004889Z","last_seen":"2025-02-03T15:46:39.278740029Z"}},"from":"edge"}]"#;

crates/components-runtime/src/config.rs

@@ -1,3 +1,4 @@
+use crate::data_collection::version::DataCollectionWitVersion;
 use std::{collections::HashMap, path::PathBuf};
 
 use serde::Deserialize;
@@ -11,7 +12,7 @@ pub struct ComponentsConfiguration {
     pub cache: Option<PathBuf>,
 }
 
-#[derive(Deserialize, Debug, Default, Clone)]
+#[derive(Deserialize, Debug, Clone, Default)]
 pub struct DataCollectionComponents {
     #[serde(skip_deserializing)]
     pub project_component_id: String,
@@ -21,6 +22,7 @@ pub struct DataCollectionComponents {
     pub file: String,
     #[serde(default)]
     pub settings: DataCollectionComponentSettings,
+    pub wit_version: DataCollectionWitVersion,
 }
 
 #[derive(Deserialize, Debug, Clone)]

crates/components-runtime/src/context.rs

@@ -8,22 +8,50 @@ use wasmtime_wasi::{IoView, WasiCtx, WasiView};
 
 use crate::config::{ComponentsConfiguration, DataCollectionComponents};
 use crate::consent_mapping::{ConsentMapping, ConsentMappingPre};
-use crate::data_collection::{DataCollection, DataCollectionPre};
+use crate::data_collection::v0_5_0::data_collection::{
+    DataCollectionZeroFiveZero, DataCollectionZeroFiveZeroPre,
+};
+use crate::data_collection::v1_0_0::data_collection::{
+    DataCollectionOneZeroZero, DataCollectionOneZeroZeroPre,
+};
+use crate::data_collection::version::DataCollectionWitVersion;
 
 pub struct ComponentsContext {
     pub engine: Engine,
     pub components: Components,
 }
 
 pub struct Components {
-    pub data_collection: HashMap<String, DataCollectionPre<HostState>>,
+    pub data_collection_0_5_0: HashMap<String, DataCollectionZeroFiveZeroPre<HostState>>,
+    pub data_collection: HashMap<String, DataCollectionOneZeroZeroPre<HostState>>,
     pub consent_mapping: HashMap<String, ConsentMappingPre<HostState>>,
 }
 
 pub fn pre_instanciate_data_collection_component_internal(
     engine: &Engine,
     component_config: &DataCollectionComponents,
-) -> anyhow::Result<DataCollectionPre<HostState>> {
+) -> anyhow::Result<DataCollectionOneZeroZeroPre<HostState>> {
+    let mut linker = Linker::new(engine);
+    wasmtime_wasi::add_to_linker_async(&mut linker)?;
+
+    let span = tracing::info_span!("component-context", component = %component_config.id, category = "data-collection");
+    let _span = span.enter();
+
+    tracing::debug!("Loading new data collection component");
+
+    let component = Component::from_file(engine, &component_config.file)?;
+    let instance_pre = linker.instantiate_pre(&component)?;
+    let instance_pre = DataCollectionOneZeroZeroPre::new(instance_pre)?;
+
+    tracing::debug!("loaded new data collection component");
+
+    Ok(instance_pre)
+}
+
+pub fn pre_instanciate_data_collection_0_5_0_component_internal(
+    engine: &Engine,
+    component_config: &DataCollectionComponents,
+) -> anyhow::Result<DataCollectionZeroFiveZeroPre<HostState>> {
     let mut linker = Linker::new(engine);
     wasmtime_wasi::add_to_linker_async(&mut linker)?;
 
@@ -34,7 +62,7 @@ pub fn pre_instanciate_data_collection_component_internal(
 
     let component = Component::from_file(engine, &component_config.file)?;
     let instance_pre = linker.instantiate_pre(&component)?;
-    let instance_pre = DataCollectionPre::new(instance_pre)?;
+    let instance_pre = DataCollectionZeroFiveZeroPre::new(instance_pre)?;
 
     tracing::debug!("loaded new data collection component");
 
@@ -62,13 +90,25 @@ impl ComponentsContext {
         let data_collection_components = config
             .data_collection
             .iter()
+            .filter(|entry| entry.wit_version == DataCollectionWitVersion::V1_0_0)
             .map(|entry| {
                 let instance_pre =
                     pre_instanciate_data_collection_component_internal(&engine, entry)?;
                 Ok((entry.id.clone(), instance_pre))
             })
             .collect::<anyhow::Result<_>>()?;
 
+        let data_collection_0_5_0_components = config
+            .data_collection
+            .iter()
+            .filter(|entry| entry.wit_version == DataCollectionWitVersion::V0_5_0)
+            .map(|entry| {
+                let instance_pre =
+                    pre_instanciate_data_collection_0_5_0_component_internal(&engine, entry)?;
+                Ok((entry.id.clone(), instance_pre))
+            })
+            .collect::<anyhow::Result<_>>()?;
+
         // Consent mapping components
         let consent_mapping_components = config
             .consent_mapping
@@ -91,6 +131,7 @@ impl ComponentsContext {
 
         let components = Components {
             data_collection: data_collection_components,
+            data_collection_0_5_0: data_collection_0_5_0_components,
             consent_mapping: consent_mapping_components,
         };
 
@@ -100,7 +141,7 @@ impl ComponentsContext {
     pub fn pre_instanciate_data_collection_component(
         &self,
         component_config: DataCollectionComponents,
-    ) -> anyhow::Result<DataCollectionPre<HostState>> {
+    ) -> anyhow::Result<DataCollectionOneZeroZeroPre<HostState>> {
         let instance_pre =
             pre_instanciate_data_collection_component_internal(&self.engine, &component_config)?;
         Ok(instance_pre)
@@ -109,7 +150,7 @@ impl ComponentsContext {
     pub fn add_data_collection_component(
         &mut self,
         component_config: DataCollectionComponents,
-        instance_pre: DataCollectionPre<HostState>,
+        instance_pre: DataCollectionOneZeroZeroPre<HostState>,
     ) {
         if !self
             .components
@@ -134,7 +175,7 @@ impl ComponentsContext {
         &self,
         id: &str,
         store: &mut Store<HostState>,
-    ) -> anyhow::Result<DataCollection> {
+    ) -> anyhow::Result<DataCollectionOneZeroZero> {
         let instance_pre = self.components.data_collection.get(id);
 
         if instance_pre.is_none() {
@@ -144,6 +185,20 @@ impl ComponentsContext {
         instance_pre.unwrap().instantiate_async(store).await
     }
 
+    pub async fn get_data_collection_0_5_0_instance(
+        &self,
+        id: &str,
+        store: &mut Store<HostState>,
+    ) -> anyhow::Result<DataCollectionZeroFiveZero> {
+        let instance_pre = self.components.data_collection_0_5_0.get(id);
+
+        if instance_pre.is_none() {
+            return Err(anyhow::anyhow!("component not found: {}", id));
+        }
+
+        instance_pre.unwrap().instantiate_async(store).await
+    }
+
     pub async fn get_consent_mapping_instance(
         &self,
         id: &str,