diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index e6eefad..0ac75c4 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,6 +15,8 @@ jobs: with: target: wasm32-wasip2 # WebAssembly target components: rustfmt + - uses: edgee-cloud/install-edgee-cli@v0.1.0 + - run: edgee component build - run: cargo check fmt: name: cargo fmt @@ -24,6 +26,9 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: components: rustfmt + target: wasm32-wasip2 + - uses: edgee-cloud/install-edgee-cli@v0.1.0 + - run: edgee component build - uses: actions-rust-lang/rustfmt@v1 clippy: name: clippy @@ -35,6 +40,9 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: components: clippy + target: wasm32-wasip2 + - uses: edgee-cloud/install-edgee-cli@v0.1.0 + - run: edgee component build - uses: wearerequired/lint-action@master with: clippy: true @@ -44,6 +52,10 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable + with: + target: wasm32-wasip2 + - uses: edgee-cloud/install-edgee-cli@v0.1.0 + - run: edgee component build - run: make test coverage: @@ -52,6 +64,10 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable + with: + target: wasm32-wasip2 - uses: taiki-e/install-action@cargo-llvm-cov + - uses: edgee-cloud/install-edgee-cli@v0.1.0 + - run: edgee component build - run: make test.coverage.lcov - - uses: coverallsapp/github-action@v2 \ No newline at end of file + - uses: coverallsapp/github-action@v2 diff --git a/.gitignore b/.gitignore index b805dae..125c3db 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ target/ linkedin_capi.wasm wasi_snapshot_preview1.reactor.wasm lcov.info +.edgee/ diff --git a/Cargo.lock b/Cargo.lock index a1e5f4e..8983f0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -564,7 +564,7 @@ dependencies = [ [[package]] name = "linkedin-capi-component" -version = "0.8.1" +version = "1.0.0" dependencies = [ "anyhow", "cargo-llvm-cov", diff --git a/Cargo.toml b/Cargo.toml index 962f748..757bb45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "linkedin-capi-component" -version = "0.8.1" +version = "1.0.0" edition = "2021" [lib] diff --git a/edgee-component.toml b/edgee-component.toml index 057eac2..474854c 100644 --- a/edgee-component.toml +++ b/edgee-component.toml @@ -2,7 +2,7 @@ manifest-version = 1 [component] name = "Linkedin Capi" -version = "0.8.1" +version = "1.0.0" category = "data-collection" subcategory = "conversion-api" description = """ @@ -11,8 +11,9 @@ sales completed over the phone, or leads collected in-person at an event. """ documentation = "https://www.edgee.cloud/docs/components/data-collection/linkedin-capi" repository = "https://github.com/edgee-cloud/linkedin-capi-component" -wit-world-version = "0.5.0" +wit-version = "1.0.0" icon-path = "linkedin.png" +language = "Rust" [component.build] command = "cargo build --target wasm32-wasip2 --release && cp ./target/wasm32-wasip2/release/linkedin_capi_component.wasm linkedin_capi.wasm" diff --git a/src/lib.rs b/src/lib.rs index ad708a1..c923f9e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,7 +5,7 @@ use crate::exports::edgee::components::data_collection::{ }; use linkedin_payload::{LinkedinEvent, LinkedinPayload}; -wit_bindgen::generate!({world: "data-collection", path: "wit", generate_all}); +wit_bindgen::generate!({world: "data-collection", path: ".edgee/wit", generate_all}); export!(LinkedinComponent); @@ -139,7 +139,7 @@ mod tests { locale, timezone: "CET".to_string(), user_agent: "Chrome".to_string(), - user_agent_architecture: "fuck knows".to_string(), + user_agent_architecture: "x86".to_string(), user_agent_bitness: "64".to_string(), user_agent_full_version_list: "abc".to_string(), user_agent_version_list: "abc".to_string(), diff --git a/wit/deps.lock b/wit/deps.lock deleted file mode 100644 index 6455ab3..0000000 --- a/wit/deps.lock +++ /dev/null @@ -1,4 +0,0 @@ -[edgee] -url = "https://github.com/edgee-cloud/edgee-wit/archive/refs/tags/v0.5.0.tar.gz" -sha256 = "f6e11c5cde39ec04b024b1181f45e896f154f7677ff5a904c99f6af5224dc371" -sha512 = "21b045d0fb82a793a6176f6d9e98dab868563ab7906e3762601e14f06a715e36c965e83e6f5c76cf016af03df48d219b86165a7c18d14284e967d0b837bf99e4" diff --git a/wit/deps.toml b/wit/deps.toml deleted file mode 100644 index d8cf7c4..0000000 --- a/wit/deps.toml +++ /dev/null @@ -1 +0,0 @@ -edgee = "https://github.com/edgee-cloud/edgee-wit/archive/refs/tags/v0.5.0.tar.gz" \ No newline at end of file diff --git a/wit/deps/edgee/consent-mapping.wit b/wit/deps/edgee/consent-mapping.wit deleted file mode 100644 index b284aa0..0000000 --- a/wit/deps/edgee/consent-mapping.wit +++ /dev/null @@ -1,13 +0,0 @@ -package edgee:components; - -interface consent-mapping { - type dict = list>; - - enum consent { - pending, - granted, - denied, - } - - map: func(cookie: string, settings: dict) -> option; -} \ No newline at end of file diff --git a/wit/deps/edgee/data-collection.wit b/wit/deps/edgee/data-collection.wit deleted file mode 100644 index 994c537..0000000 --- a/wit/deps/edgee/data-collection.wit +++ /dev/null @@ -1,114 +0,0 @@ -package edgee:components; - -interface data-collection { - type dict = list>; - - enum event-type { page, track, user } - enum consent { pending, granted, denied } - - record event { - uuid: string, - timestamp: s64, - timestamp-millis: s64, - timestamp-micros: s64, - event-type: event-type, - data: data, - context: context, - consent: option, - } - - variant data { - page(page-data), - track(track-data), - user(user-data), - } - - record page-data { - name: string, - category: string, - keywords: list, - title: string, - url: string, - path: string, - search: string, - referrer: string, - properties: dict, - } - - record user-data { - user-id: string, - anonymous-id: string, - edgee-id: string, - properties: dict, - } - - record track-data { - name: string, - properties: dict, - products: list, - } - - record context { - page: page-data, - user: user-data, - client: client, - campaign: campaign, - session: session, - } - - record client { - ip: string, - locale: string, - timezone: string, - user-agent: string, - user-agent-architecture: string, - user-agent-bitness: string, - user-agent-version-list: string, - user-agent-full-version-list: string, - user-agent-mobile: string, - user-agent-model: string, - os-name: string, - os-version: string, - screen-width: s32, - screen-height: s32, - screen-density: f32, - continent: string, - country-code: string, - country-name: string, - region: string, - city: string, - } - - record campaign { - name: string, - source: string, - medium: string, - term: string, - content: string, - creative-format: string, - marketing-tactic: string, - } - - record session { - session-id: string, - previous-session-id: string, - session-count: u32, - session-start: bool, - first-seen: s64, - last-seen: s64, - } - - record edgee-request { - method: http-method, - url: string, - headers: dict, - forward-client-headers: bool, - body: string, - } - - enum http-method { GET, PUT, POST, DELETE } - - page: func(e: event, settings: dict) -> result; - track: func(e: event, settings: dict) -> result; - user: func(e: event, settings:dict) -> result; -} \ No newline at end of file diff --git a/wit/world.wit b/wit/world.wit deleted file mode 100644 index da84f88..0000000 --- a/wit/world.wit +++ /dev/null @@ -1,5 +0,0 @@ -package edgee:native; - -world data-collection { - export edgee:components/data-collection; -} \ No newline at end of file