From 1f1a4e7fad5931590083e583f7973f83b96223a3 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 09:07:35 +0700 Subject: [PATCH 01/23] feat(rust): add flutter_rust_bridge tool Signed-off-by: bkioshn --- earthly/rust/Earthfile | 1 + earthly/rust/tools/Earthfile | 3 +++ 2 files changed, 4 insertions(+) diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index 3ce1775e8..90383ae83 100644 --- a/earthly/rust/Earthfile +++ b/earthly/rust/Earthfile @@ -133,6 +133,7 @@ rust-base-plus-tools: DO +COPY_TOOL --tool="cargo-sweep" DO +COPY_TOOL --tool="cargo-component" DO +COPY_TOOL --tool="wasm-pack" + DO +COPY_TOOL --tool="flutter-rust-bridge" # installer - fully setup our Rust caching. installer: diff --git a/earthly/rust/tools/Earthfile b/earthly/rust/tools/Earthfile index 0d072a3f4..477bf56f8 100644 --- a/earthly/rust/tools/Earthfile +++ b/earthly/rust/tools/Earthfile @@ -82,3 +82,6 @@ tool-cargo-component: tool-wasm-pack: DO +CARGO_BINSTALL --package=wasm-pack --version=0.13.0 + +tool-flutter-rust-bridge: + DO +CARGO_BINSTALL --package=flutter_rust_bridge --version=2.5.1 From 657c66f1be781851f3686973c1fde8295ca5a913 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 09:10:28 +0700 Subject: [PATCH 02/23] fix(rust): flutter_rust_bridge tool package name Signed-off-by: bkioshn --- earthly/rust/tools/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/earthly/rust/tools/Earthfile b/earthly/rust/tools/Earthfile index 477bf56f8..e044bc1fe 100644 --- a/earthly/rust/tools/Earthfile +++ b/earthly/rust/tools/Earthfile @@ -84,4 +84,4 @@ tool-wasm-pack: DO +CARGO_BINSTALL --package=wasm-pack --version=0.13.0 tool-flutter-rust-bridge: - DO +CARGO_BINSTALL --package=flutter_rust_bridge --version=2.5.1 + DO +CARGO_BINSTALL --package=flutter_rust_bridge_codegen --version=2.5.1 From 10d0e07dfdcc1ba946510996e0652617408b8282 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 09:28:43 +0700 Subject: [PATCH 03/23] fix(rust): flutter_rust_bridge install Signed-off-by: bkioshn --- earthly/rust/Earthfile | 5 +++-- earthly/rust/tools/Earthfile | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index 90383ae83..42fde119e 100644 --- a/earthly/rust/Earthfile +++ b/earthly/rust/Earthfile @@ -112,7 +112,8 @@ COPY_TOOL: FUNCTION ARG --required tool - COPY rust-tools+tool-$tool/$tool $CARGO_HOME/bin/$tool + ARG bin = $tool + COPY rust-tools+tool-$tool/$bin $CARGO_HOME/bin/$bin # rust-base-plus-tools : Add all tools we use for rust builds to the base builder image. @@ -133,7 +134,7 @@ rust-base-plus-tools: DO +COPY_TOOL --tool="cargo-sweep" DO +COPY_TOOL --tool="cargo-component" DO +COPY_TOOL --tool="wasm-pack" - DO +COPY_TOOL --tool="flutter-rust-bridge" + DO +COPY_TOOL --tool="flutter-rust-bridge-codegen" --bin="flutter_rust_bridge_codegen" # installer - fully setup our Rust caching. installer: diff --git a/earthly/rust/tools/Earthfile b/earthly/rust/tools/Earthfile index e044bc1fe..a24b19646 100644 --- a/earthly/rust/tools/Earthfile +++ b/earthly/rust/tools/Earthfile @@ -83,5 +83,5 @@ tool-cargo-component: tool-wasm-pack: DO +CARGO_BINSTALL --package=wasm-pack --version=0.13.0 -tool-flutter-rust-bridge: - DO +CARGO_BINSTALL --package=flutter_rust_bridge_codegen --version=2.5.1 +tool-flutter-rust-bridge-codegen: + DO +CARGO_BINSTALL --package=flutter_rust_bridge_codegen --version=2.5.1 --executable="flutter_rust_bridge_codegen" From c3369a2cb1974088c904f414d7e8ac349775d986 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 11:04:20 +0700 Subject: [PATCH 04/23] fix(rust): add builder for flutter_rust_bridge Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 earthly/flutter_rust_bridge/Earthfile diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile new file mode 100644 index 000000000..861962fca --- /dev/null +++ b/earthly/flutter_rust_bridge/Earthfile @@ -0,0 +1,24 @@ +VERSION 0.8 + +IMPORT ../flutter AS flutter-ci +IMPORT ../rust AS rust-ci + +# This will be refactored in the future +# TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322 +builder: + FROM debian:stable-slim + + RUN apt-get update \ + && apt-get install -y \ + apt-utils \ + wget \ + tar \ + xz-utils \ + git + + DO flutter-ci+INSTALL_FLUTTER + DO rust-ci+INSTALL_RUST + + DO rust-ci+COPY_TOOL --tool="flutter-rust-bridge-codegen" --bin="flutter_rust_bridge_codegen" + + RUN flutter_rust_bridge_codegen --version From 6414b31b66a2dc1a9f033812b8962770e4c8f5e3 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 11:05:21 +0700 Subject: [PATCH 05/23] fix(flutter): create install flutter function Signed-off-by: bkioshn --- earthly/flutter/Earthfile | 45 ++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/earthly/flutter/Earthfile b/earthly/flutter/Earthfile index c4cec1caf..2c3f6038e 100644 --- a/earthly/flutter/Earthfile +++ b/earthly/flutter/Earthfile @@ -4,21 +4,36 @@ VERSION 0.8 IMPORT ./installer AS installer -# flutter-src save Flutter source code as artifact. -flutter-src: - FROM busybox +# TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322 +# Install flutter. +INSTALL_FLUTTER: + FUNCTION ARG version=3.24.1 ARG TARGETARCH - RUN mkdir -p /flutter + # Install Flutter IF [ "$TARGETARCH" = "amd64" ] RUN wget -qO - https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_$version-stable.tar.xz \ - | tar -xJ -C /flutter + | tar -xJ -C /usr/local + ELSE IF [ "$TARGETARCH" = "arm64" ] + GIT CLONE --branch $version https://github.com/flutter/flutter.git /usr/local ELSE - GIT CLONE --branch $version https://github.com/flutter/flutter.git /flutter + RUN echo >&2 "unsupported architecture: ${TARGETARCH}"; exit 1 END - SAVE ARTIFACT /flutter flutter + RUN git config --global --add safe.directory /usr/local/flutter + ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:$HOME/.pub-cache/bin:${PATH}" + + RUN flutter config --no-analytics + RUN flutter --version + RUN flutter doctor -v + RUN flutter config --enable-web + RUN dart pub global activate melos + RUN dart pub global activate junitreport + RUN dart pub global activate coverage + RUN dart pub global activate combine_coverage + RUN dart pub global activate license_checker + # flutter-base installs required tools and packages. flutter-base: FROM debian:bookworm-20240513-slim @@ -26,7 +41,9 @@ flutter-base: ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update --fix-missing - RUN apt-get install -y apt-utils git curl gzip unzip bzip2 bash jq gpg lcov + RUN apt-get install -y apt-utils git curl gzip unzip bzip2 bash jq gpg lcov tar wget xz-utils + + DO +INSTALL_FLUTTER WORKDIR frontend @@ -37,17 +54,7 @@ flutter-base: ARG edge_package_release = 1 DO installer+INSTALL_EDGE_LINUX64 --edge_version=$edge_version --edge_package_release=$edge_package_release - COPY +flutter-src/flutter /usr/local - ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:$HOME/.pub-cache/bin:${PATH}" - RUN flutter config --no-analytics - RUN flutter --version - RUN flutter doctor -v - RUN flutter config --enable-web - RUN dart pub global activate melos - RUN dart pub global activate junitreport - RUN dart pub global activate coverage - RUN dart pub global activate combine_coverage - RUN dart pub global activate license_checker + # test-flutter-base-amd64 : installs required tools and packages for amd64. test-flutter-base-amd64: From a29cc10c8189a3da1ae542c8d11b4ce4b301b196 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 11:05:44 +0700 Subject: [PATCH 06/23] fix(rust): create install rust function Signed-off-by: bkioshn --- earthly/rust/Earthfile | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index 42fde119e..ad55e29d8 100644 --- a/earthly/rust/Earthfile +++ b/earthly/rust/Earthfile @@ -16,6 +16,40 @@ IMPORT ../../utilities/scripts AS scripts # cspell: words TARGETPLATFORM TARGETOS TARGETARCH TARGETVARIANT USERPLATFORM USEROS USERARCH USERVARIANT # cspell: words findutils fileset pkgconfig wasip +# TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322 +# Installing Rust +# Code reference from [rust1.81.0-slim-bookworm](https://github.com/rust-lang/docker-rust/blob/63f877a36f8ba9d9b4b35cd49df3327264510886/stable/bookworm/slim/Dockerfile) +INSTALL_RUST: + FUNCTION + + ARG TARGETARCH + + ENV RUSTUP_HOME=/usr/local/rustup + ENV CARGO_HOME=/usr/local/cargo + ENV PATH=/usr/local/cargo/bin:$PATH + ENV RUST_VERSION=1.81.0 + + IF [ "$TARGETARCH" = "amd64" ] + LET PLATFORM = "x86_64-unknown-linux-gnu" + LET RUSTUP_SHA = "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" + ELSE IF [ "$TARGETARCH" = "arm64" ] + LET PLATFORM = "aarch64-unknown-linux-gnu" + LET RUSTUP_SHA = "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" + ELSE + RUN echo >&2 "unsupported architecture: ${TARGETARCH}"; exit 1 + END + + LET URL = "https://static.rust-lang.org/rustup/archive/1.27.1/${PLATFORM}/rustup-init" + RUN wget $URL && echo "${RUSTUP_SHA} *rustup-init" | sha256sum -c - \ + && chmod +x rustup-init \ + && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host $PLATFORM \ + && rm rustup-init \ + && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \ + && rustup --version \ + && cargo --version \ + && rustc --version \ + && rm -rf /var/lib/apt/lists/* + # rust-base : Base Rustup build container. # Not called directly, used by other targets. rust-base: @@ -134,7 +168,6 @@ rust-base-plus-tools: DO +COPY_TOOL --tool="cargo-sweep" DO +COPY_TOOL --tool="cargo-component" DO +COPY_TOOL --tool="wasm-pack" - DO +COPY_TOOL --tool="flutter-rust-bridge-codegen" --bin="flutter_rust_bridge_codegen" # installer - fully setup our Rust caching. installer: From 4e0156409fd9503cb639114799f7aec67cae3360 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 11:09:23 +0700 Subject: [PATCH 07/23] fix: add word to dict Signed-off-by: bkioshn --- .config/dictionaries/project.dic | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/dictionaries/project.dic b/.config/dictionaries/project.dic index bccaac193..74723fad7 100644 --- a/.config/dictionaries/project.dic +++ b/.config/dictionaries/project.dic @@ -1,6 +1,7 @@ aarch bindgen binstall +bkioshn buildkit camelcase canvaskit @@ -46,6 +47,7 @@ gopls gosec graphviz idents +JDBC jorm jormungandr junitreport @@ -89,6 +91,7 @@ PYTHONDONTWRITEBYTECODE rankdir rivo runewidth +rustc rustdoc rustdocflags rustflags @@ -122,4 +125,3 @@ xerrors xvfb zstd zstdcat -JDBC \ No newline at end of file From c207ec669a633079e96fc9609cb24df2e7931d0c Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 11:16:28 +0700 Subject: [PATCH 08/23] fix: add code gen web Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 861962fca..0d3a277b7 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -8,6 +8,8 @@ IMPORT ../rust AS rust-ci builder: FROM debian:stable-slim + WORKDIR /work + RUN apt-get update \ && apt-get install -y \ apt-utils \ @@ -22,3 +24,13 @@ builder: DO rust-ci+COPY_TOOL --tool="flutter-rust-bridge-codegen" --bin="flutter_rust_bridge_codegen" RUN flutter_rust_bridge_codegen --version + +# Generated necessary files for running Flutter web. +code-generator-web: + FROM +builder + RUN flutter_rust_bridge_codegen generate + RUN flutter_rust_bridge_codegen build-web + + SAVE ARTIFACT ./web/pkg pkg + SAVE ARTIFACT ./rust/src/frb_generated.rs frb_generated + SAVE ARTIFACT ./lib/src lib_src \ No newline at end of file From 29b29b86349bd18ad27a745f02c1b022ad8b9fef Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 11:18:01 +0700 Subject: [PATCH 09/23] fix: code gen web as a function Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 0d3a277b7..50c73623b 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -26,8 +26,9 @@ builder: RUN flutter_rust_bridge_codegen --version # Generated necessary files for running Flutter web. -code-generator-web: - FROM +builder +CODE_GENERATOR_WEB: + FUNCTION + RUN flutter_rust_bridge_codegen generate RUN flutter_rust_bridge_codegen build-web From b073227e49ee9206e428c4add33cb139e424e392 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 11:19:08 +0700 Subject: [PATCH 10/23] fix: remove save artifact Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 50c73623b..d4e952f1f 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -31,7 +31,3 @@ CODE_GENERATOR_WEB: RUN flutter_rust_bridge_codegen generate RUN flutter_rust_bridge_codegen build-web - - SAVE ARTIFACT ./web/pkg pkg - SAVE ARTIFACT ./rust/src/frb_generated.rs frb_generated - SAVE ARTIFACT ./lib/src lib_src \ No newline at end of file From 4677507d47eb1ea2b6491162a07d716f68eb87c0 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 12:05:53 +0700 Subject: [PATCH 11/23] fix(rust): rust install Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 5 +- earthly/rust/Earthfile | 123 ++++++++++++++++++-------- 2 files changed, 89 insertions(+), 39 deletions(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index d4e952f1f..406d123b5 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -20,10 +20,7 @@ builder: DO flutter-ci+INSTALL_FLUTTER DO rust-ci+INSTALL_RUST - - DO rust-ci+COPY_TOOL --tool="flutter-rust-bridge-codegen" --bin="flutter_rust_bridge_codegen" - - RUN flutter_rust_bridge_codegen --version + DO rust-ci+INSTALL_TOOLS # Generated necessary files for running Flutter web. CODE_GENERATOR_WEB: diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index ad55e29d8..35212c594 100644 --- a/earthly/rust/Earthfile +++ b/earthly/rust/Earthfile @@ -16,40 +16,6 @@ IMPORT ../../utilities/scripts AS scripts # cspell: words TARGETPLATFORM TARGETOS TARGETARCH TARGETVARIANT USERPLATFORM USEROS USERARCH USERVARIANT # cspell: words findutils fileset pkgconfig wasip -# TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322 -# Installing Rust -# Code reference from [rust1.81.0-slim-bookworm](https://github.com/rust-lang/docker-rust/blob/63f877a36f8ba9d9b4b35cd49df3327264510886/stable/bookworm/slim/Dockerfile) -INSTALL_RUST: - FUNCTION - - ARG TARGETARCH - - ENV RUSTUP_HOME=/usr/local/rustup - ENV CARGO_HOME=/usr/local/cargo - ENV PATH=/usr/local/cargo/bin:$PATH - ENV RUST_VERSION=1.81.0 - - IF [ "$TARGETARCH" = "amd64" ] - LET PLATFORM = "x86_64-unknown-linux-gnu" - LET RUSTUP_SHA = "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" - ELSE IF [ "$TARGETARCH" = "arm64" ] - LET PLATFORM = "aarch64-unknown-linux-gnu" - LET RUSTUP_SHA = "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" - ELSE - RUN echo >&2 "unsupported architecture: ${TARGETARCH}"; exit 1 - END - - LET URL = "https://static.rust-lang.org/rustup/archive/1.27.1/${PLATFORM}/rustup-init" - RUN wget $URL && echo "${RUSTUP_SHA} *rustup-init" | sha256sum -c - \ - && chmod +x rustup-init \ - && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host $PLATFORM \ - && rm rustup-init \ - && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \ - && rustup --version \ - && cargo --version \ - && rustc --version \ - && rm -rf /var/lib/apt/lists/* - # rust-base : Base Rustup build container. # Not called directly, used by other targets. rust-base: @@ -395,4 +361,91 @@ REMOVE_SOURCE_FINGERPRINTS: find . -maxdepth 1 -regex "\./$source_lib-[^-]+" -exec bash -c 'echo "deleting $(readlink -f {})"; rm -rf {}' \; ; \ done \ fi; \ - done; \ No newline at end of file + done; + +# TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322 +# Installing Rust +# Code reference from [rust1.81.0-slim-bookworm](https://github.com/rust-lang/docker-rust/blob/63f877a36f8ba9d9b4b35cd49df3327264510886/stable/bookworm/slim/Dockerfile) +INSTALL_RUST: + FUNCTION + + ARG TARGETARCH + + ENV RUSTUP_HOME=/usr/local/rustup + ENV CARGO_HOME=/usr/local/cargo + ENV PATH=/usr/local/cargo/bin:$PATH + ENV RUST_VERSION=1.81.0 + + IF [ "$TARGETARCH" = "amd64" ] + LET PLATFORM = "x86_64-unknown-linux-gnu" + LET RUSTUP_SHA = "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" + ELSE IF [ "$TARGETARCH" = "arm64" ] + LET PLATFORM = "aarch64-unknown-linux-gnu" + LET RUSTUP_SHA = "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" + ELSE + RUN echo >&2 "unsupported architecture: ${TARGETARCH}"; exit 1 + END + + LET URL = "https://static.rust-lang.org/rustup/archive/1.27.1/${PLATFORM}/rustup-init" + RUN wget $URL && echo "${RUSTUP_SHA} *rustup-init" | sha256sum -c - \ + && chmod +x rustup-init \ + && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host $PLATFORM \ + && rm rustup-init \ + && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \ + && rustup --version \ + && cargo --version \ + && rustc --version \ + && rm -rf /var/lib/apt/lists/* + + # Make sure we have cargo. + RUN rustup component add cargo + + # Make sure we have the clippy linter. + RUN rustup component add clippy + + # Needed to generate code coverage. + RUN rustup component add llvm-tools-preview + + # Install a nightly toolchain which matches. + RUN rustup toolchain install nightly --component miri --component rust-src --component rustfmt --component clippy --component cargo + + # Ensure we have all the necessary targets + RUN rustup target add wasm32-unknown-unknown + RUN rustup target add wasm32-wasip1 + # RUN rustup target add wasm32-wasip2 # wasm32-wasip2 not yet available in stable - Try again in 1.82 + RUN rustup target add x86_64-unknown-linux-gnu + RUN rustup target add x86_64-apple-darwin + RUN rustup target add x86_64-pc-windows-gnu + RUN rustup target add aarch64-unknown-linux-gnu + RUN rustup target add aarch64-apple-darwin + + RUN rustup target add wasm32-unknown-unknown --toolchain nightly + RUN rustup target add wasm32-wasip1 --toolchain nightly + RUN rustup target add wasm32-wasip2 --toolchain nightly + RUN rustup target add x86_64-unknown-linux-gnu --toolchain nightly + RUN rustup target add x86_64-apple-darwin --toolchain nightly + RUN rustup target add x86_64-pc-windows-gnu --toolchain nightly + RUN rustup target add aarch64-unknown-linux-gnu --toolchain nightly + RUN rustup target add aarch64-apple-darwin --toolchain nightly + +# Install neccessary tools for Rust. +INSTALL_TOOLS: + FUNCTION + # Install cargo-binstall so we can speed up tool installation. + DO rust-tools+CARGO_BINSTALL_INSTALL + + DO +COPY_TOOL --tool="cargo-nextest" + DO +COPY_TOOL --tool="cargo-machete" + DO +COPY_TOOL --tool="refinery" + DO +COPY_TOOL --tool="cargo-deny" + DO +COPY_TOOL --tool="cargo-modules" + DO +COPY_TOOL --tool="cargo-depgraph" + DO +COPY_TOOL --tool="cargo-llvm-cov" + DO +COPY_TOOL --tool="wasm-tools" + DO +COPY_TOOL --tool="cargo-expand" + DO +COPY_TOOL --tool="wit-bindgen" + DO +COPY_TOOL --tool="cargo-sweep" + DO +COPY_TOOL --tool="cargo-component" + DO +COPY_TOOL --tool="wasm-pack" + DO +COPY_TOOL --tool="flutter-rust-bridge-codegen" --bin="flutter_rust_bridge_codegen" + \ No newline at end of file From 08d9a09492e8e0e9fc23e3ce5a9be5d0580ad0b3 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 12:14:47 +0700 Subject: [PATCH 12/23] fix: flutter_rust_bridge builder Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 406d123b5..76f2c1c47 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -16,7 +16,8 @@ builder: wget \ tar \ xz-utils \ - git + git \ + build-essential DO flutter-ci+INSTALL_FLUTTER DO rust-ci+INSTALL_RUST From fdf9ee8fccb827a9375c763985240b86e1a7dfb7 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Mon, 4 Nov 2024 12:15:39 +0700 Subject: [PATCH 13/23] fix: typo Signed-off-by: bkioshn --- earthly/rust/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index 35212c594..9d59251aa 100644 --- a/earthly/rust/Earthfile +++ b/earthly/rust/Earthfile @@ -428,7 +428,7 @@ INSTALL_RUST: RUN rustup target add aarch64-unknown-linux-gnu --toolchain nightly RUN rustup target add aarch64-apple-darwin --toolchain nightly -# Install neccessary tools for Rust. +# Install necessary tools for Rust. INSTALL_TOOLS: FUNCTION # Install cargo-binstall so we can speed up tool installation. From 0ae7c4c723fb0ac809519a7efb93506477e71db0 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Tue, 5 Nov 2024 08:23:04 +0700 Subject: [PATCH 14/23] fix: add flutter_rust_bridge to existing flutter example Signed-off-by: bkioshn --- .../flutter/example/flutter_rust_bridge.yaml | 3 + .../example/integration_test/simple_test.dart | 13 + examples/flutter/example/lib/main.dart | 276 ++++++----- .../example/lib/src/rust/api/simple.dart | 10 + .../example/lib/src/rust/frb_generated.dart | 238 +++++++++ .../lib/src/rust/frb_generated.io.dart | 84 ++++ .../lib/src/rust/frb_generated.web.dart | 84 ++++ .../linux/flutter/generated_plugins.cmake | 1 + examples/flutter/example/pubspec.lock | 102 ++++ examples/flutter/example/pubspec.yaml | 5 + examples/flutter/example/rust/.gitignore | 1 + examples/flutter/example/rust/Cargo.toml | 10 + examples/flutter/example/rust/src/api/mod.rs | 1 + .../flutter/example/rust/src/api/simple.rs | 10 + .../flutter/example/rust/src/frb_generated.rs | 276 +++++++++++ examples/flutter/example/rust/src/lib.rs | 2 + .../flutter/example/rust_builder/.gitignore | 29 ++ .../flutter/example/rust_builder/README.md | 1 + .../example/rust_builder/android/.gitignore | 9 + .../example/rust_builder/android/build.gradle | 56 +++ .../rust_builder/android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 3 + .../example/rust_builder/cargokit/.gitignore | 4 + .../example/rust_builder/cargokit/LICENSE | 42 ++ .../example/rust_builder/cargokit/README | 11 + .../rust_builder/cargokit/build_pod.sh | 58 +++ .../cargokit/build_tool/README.md | 5 + .../cargokit/build_tool/analysis_options.yaml | 34 ++ .../cargokit/build_tool/lib/build_tool.dart | 8 + .../lib/src/android_environment.dart | 195 ++++++++ .../lib/src/artifacts_provider.dart | 266 ++++++++++ .../build_tool/lib/src/build_cmake.dart | 40 ++ .../build_tool/lib/src/build_gradle.dart | 49 ++ .../build_tool/lib/src/build_pod.dart | 89 ++++ .../build_tool/lib/src/build_tool.dart | 271 +++++++++++ .../cargokit/build_tool/lib/src/builder.dart | 198 ++++++++ .../cargokit/build_tool/lib/src/cargo.dart | 48 ++ .../build_tool/lib/src/crate_hash.dart | 124 +++++ .../build_tool/lib/src/environment.dart | 68 +++ .../cargokit/build_tool/lib/src/logging.dart | 52 ++ .../cargokit/build_tool/lib/src/options.dart | 309 ++++++++++++ .../lib/src/precompile_binaries.dart | 202 ++++++++ .../cargokit/build_tool/lib/src/rustup.dart | 136 ++++++ .../cargokit/build_tool/lib/src/target.dart | 140 ++++++ .../cargokit/build_tool/lib/src/util.dart | 172 +++++++ .../build_tool/lib/src/verify_binaries.dart | 84 ++++ .../cargokit/build_tool/pubspec.lock | 453 ++++++++++++++++++ .../cargokit/build_tool/pubspec.yaml | 33 ++ .../cargokit/cmake/cargokit.cmake | 99 ++++ .../cargokit/cmake/resolve_symlinks.ps1 | 27 ++ .../cargokit/gradle/plugin.gradle | 179 +++++++ .../rust_builder/cargokit/run_build_tool.cmd | 91 ++++ .../rust_builder/cargokit/run_build_tool.sh | 94 ++++ .../rust_builder/ios/Classes/dummy_file.c | 1 + .../rust_builder/ios/rust_lib_example.podspec | 45 ++ .../example/rust_builder/linux/CMakeLists.txt | 19 + .../rust_builder/macos/Classes/dummy_file.c | 1 + .../macos/rust_lib_example.podspec | 44 ++ .../flutter/example/rust_builder/pubspec.yaml | 34 ++ .../example/rust_builder/windows/.gitignore | 17 + .../rust_builder/windows/CMakeLists.txt | 20 + .../example/test_driver/integration_test.dart | 3 + .../windows/flutter/generated_plugins.cmake | 1 + 63 files changed, 4872 insertions(+), 109 deletions(-) create mode 100644 examples/flutter/example/flutter_rust_bridge.yaml create mode 100644 examples/flutter/example/integration_test/simple_test.dart create mode 100644 examples/flutter/example/lib/src/rust/api/simple.dart create mode 100644 examples/flutter/example/lib/src/rust/frb_generated.dart create mode 100644 examples/flutter/example/lib/src/rust/frb_generated.io.dart create mode 100644 examples/flutter/example/lib/src/rust/frb_generated.web.dart create mode 100644 examples/flutter/example/rust/.gitignore create mode 100644 examples/flutter/example/rust/Cargo.toml create mode 100644 examples/flutter/example/rust/src/api/mod.rs create mode 100644 examples/flutter/example/rust/src/api/simple.rs create mode 100644 examples/flutter/example/rust/src/frb_generated.rs create mode 100644 examples/flutter/example/rust/src/lib.rs create mode 100644 examples/flutter/example/rust_builder/.gitignore create mode 100644 examples/flutter/example/rust_builder/README.md create mode 100644 examples/flutter/example/rust_builder/android/.gitignore create mode 100644 examples/flutter/example/rust_builder/android/build.gradle create mode 100644 examples/flutter/example/rust_builder/android/settings.gradle create mode 100644 examples/flutter/example/rust_builder/android/src/main/AndroidManifest.xml create mode 100644 examples/flutter/example/rust_builder/cargokit/.gitignore create mode 100644 examples/flutter/example/rust_builder/cargokit/LICENSE create mode 100644 examples/flutter/example/rust_builder/cargokit/README create mode 100755 examples/flutter/example/rust_builder/cargokit/build_pod.sh create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/README.md create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/analysis_options.yaml create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/build_tool.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/android_environment.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_pod.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_tool.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/builder.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/cargo.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/environment.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/logging.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/options.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/rustup.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/target.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/util.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.lock create mode 100644 examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.yaml create mode 100644 examples/flutter/example/rust_builder/cargokit/cmake/cargokit.cmake create mode 100644 examples/flutter/example/rust_builder/cargokit/cmake/resolve_symlinks.ps1 create mode 100644 examples/flutter/example/rust_builder/cargokit/gradle/plugin.gradle create mode 100755 examples/flutter/example/rust_builder/cargokit/run_build_tool.cmd create mode 100755 examples/flutter/example/rust_builder/cargokit/run_build_tool.sh create mode 100644 examples/flutter/example/rust_builder/ios/Classes/dummy_file.c create mode 100644 examples/flutter/example/rust_builder/ios/rust_lib_example.podspec create mode 100644 examples/flutter/example/rust_builder/linux/CMakeLists.txt create mode 100644 examples/flutter/example/rust_builder/macos/Classes/dummy_file.c create mode 100644 examples/flutter/example/rust_builder/macos/rust_lib_example.podspec create mode 100644 examples/flutter/example/rust_builder/pubspec.yaml create mode 100644 examples/flutter/example/rust_builder/windows/.gitignore create mode 100644 examples/flutter/example/rust_builder/windows/CMakeLists.txt create mode 100644 examples/flutter/example/test_driver/integration_test.dart diff --git a/examples/flutter/example/flutter_rust_bridge.yaml b/examples/flutter/example/flutter_rust_bridge.yaml new file mode 100644 index 000000000..e15ed9167 --- /dev/null +++ b/examples/flutter/example/flutter_rust_bridge.yaml @@ -0,0 +1,3 @@ +rust_input: crate::api +rust_root: rust/ +dart_output: lib/src/rust \ No newline at end of file diff --git a/examples/flutter/example/integration_test/simple_test.dart b/examples/flutter/example/integration_test/simple_test.dart new file mode 100644 index 000000000..730333317 --- /dev/null +++ b/examples/flutter/example/integration_test/simple_test.dart @@ -0,0 +1,13 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:example/main.dart'; +import 'package:example/src/rust/frb_generated.dart'; +import 'package:integration_test/integration_test.dart'; + +void main() { + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + setUpAll(() async => await RustLib.init()); + testWidgets('Can call rust function', (WidgetTester tester) async { + await tester.pumpWidget(const MyApp()); + expect(find.textContaining('Result: `Hello, Tom!`'), findsOneWidget); + }); +} diff --git a/examples/flutter/example/lib/main.dart b/examples/flutter/example/lib/main.dart index 8e9408912..8233c02ed 100644 --- a/examples/flutter/example/lib/main.dart +++ b/examples/flutter/example/lib/main.dart @@ -1,125 +1,183 @@ +// The original content is temporarily commented out to allow generating a self-contained demo - feel free to uncomment later. + +// // The original content is temporarily commented out to allow generating a self-contained demo - feel free to uncomment later. +// +// // import 'package:flutter/material.dart'; +// // +// // void main() { +// // runApp(const MyApp()); +// // } +// // +// // class MyApp extends StatelessWidget { +// // const MyApp({super.key}); +// // +// // // This widget is the root of your application. +// // @override +// // Widget build(BuildContext context) { +// // return MaterialApp( +// // title: 'Flutter Demo', +// // theme: ThemeData( +// // // This is the theme of your application. +// // // +// // // TRY THIS: Try running your application with "flutter run". You'll see +// // // the application has a purple toolbar. Then, without quitting the app, +// // // try changing the seedColor in the colorScheme below to Colors.green +// // // and then invoke "hot reload" (save your changes or press the "hot +// // // reload" button in a Flutter-supported IDE, or press "r" if you used +// // // the command line to start the app). +// // // +// // // Notice that the counter didn't reset back to zero; the application +// // // state is not lost during the reload. To reset the state, use hot +// // // restart instead. +// // // +// // // This works for code too, not just values: Most code changes can be +// // // tested with just a hot reload. +// // colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), +// // useMaterial3: true, +// // ), +// // home: const MyHomePage(title: 'Flutter Demo Home Page'), +// // ); +// // } +// // } +// // +// // class MyHomePage extends StatefulWidget { +// // const MyHomePage({super.key, required this.title}); +// // +// // // This widget is the home page of your application. It is stateful, meaning +// // // that it has a State object (defined below) that contains fields that affect +// // // how it looks. +// // +// // // This class is the configuration for the state. It holds the values (in this +// // // case the title) provided by the parent (in this case the App widget) and +// // // used by the build method of the State. Fields in a Widget subclass are +// // // always marked "final". +// // +// // final String title; +// // +// // @override +// // State createState() => _MyHomePageState(); +// // } +// // +// // class _MyHomePageState extends State { +// // int _counter = 0; +// // +// // void _incrementCounter() { +// // setState(() { +// // // This call to setState tells the Flutter framework that something has +// // // changed in this State, which causes it to rerun the build method below +// // // so that the display can reflect the updated values. If we changed +// // // _counter without calling setState(), then the build method would not be +// // // called again, and so nothing would appear to happen. +// // _counter++; +// // }); +// // } +// // +// // @override +// // Widget build(BuildContext context) { +// // // This method is rerun every time setState is called, for instance as done +// // // by the _incrementCounter method above. +// // // +// // // The Flutter framework has been optimized to make rerunning build methods +// // // fast, so that you can just rebuild anything that needs updating rather +// // // than having to individually change instances of widgets. +// // return Scaffold( +// // appBar: AppBar( +// // // TRY THIS: Try changing the color here to a specific color (to +// // // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar +// // // change color while the other colors stay the same. +// // backgroundColor: Theme.of(context).colorScheme.inversePrimary, +// // // Here we take the value from the MyHomePage object that was created by +// // // the App.build method, and use it to set our appbar title. +// // title: Text(widget.title), +// // ), +// // body: Center( +// // // Center is a layout widget. It takes a single child and positions it +// // // in the middle of the parent. +// // child: Column( +// // // Column is also a layout widget. It takes a list of children and +// // // arranges them vertically. By default, it sizes itself to fit its +// // // children horizontally, and tries to be as tall as its parent. +// // // +// // // Column has various properties to control how it sizes itself and +// // // how it positions its children. Here we use mainAxisAlignment to +// // // center the children vertically; the main axis here is the vertical +// // // axis because Columns are vertical (the cross axis would be +// // // horizontal). +// // // +// // // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint" +// // // action in the IDE, or press "p" in the console), to see the +// // // wireframe for each widget. +// // mainAxisAlignment: MainAxisAlignment.center, +// // children: [ +// // const Text( +// // 'You have pushed the button this many times:', +// // ), +// // Text( +// // '$_counter', +// // style: Theme.of(context).textTheme.headlineMedium, +// // ), +// // ], +// // ), +// // ), +// // floatingActionButton: FloatingActionButton( +// // onPressed: _incrementCounter, +// // tooltip: 'Increment', +// // child: const Icon(Icons.add), +// // ), // This trailing comma makes auto-formatting nicer for build methods. +// // ); +// // } +// // } +// // +// +// import 'package:flutter/material.dart'; +// import 'package:example/src/rust/api/simple.dart'; +// import 'package:example/src/rust/frb_generated.dart'; +// +// Future main() async { +// await RustLib.init(); +// runApp(const MyApp()); +// } +// +// class MyApp extends StatelessWidget { +// const MyApp({super.key}); +// +// @override +// Widget build(BuildContext context) { +// return MaterialApp( +// home: Scaffold( +// appBar: AppBar(title: const Text('flutter_rust_bridge quickstart')), +// body: Center( +// child: Text( +// 'Action: Call Rust `greet("Tom")`\nResult: `${greet(name: "Tom")}`'), +// ), +// ), +// ); +// } +// } +// + import 'package:flutter/material.dart'; +import 'package:example/src/rust/api/simple.dart'; +import 'package:example/src/rust/frb_generated.dart'; -void main() { +Future main() async { + await RustLib.init(); runApp(const MyApp()); } class MyApp extends StatelessWidget { const MyApp({super.key}); - // This widget is the root of your application. @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flutter Demo', - theme: ThemeData( - // This is the theme of your application. - // - // TRY THIS: Try running your application with "flutter run". You'll see - // the application has a purple toolbar. Then, without quitting the app, - // try changing the seedColor in the colorScheme below to Colors.green - // and then invoke "hot reload" (save your changes or press the "hot - // reload" button in a Flutter-supported IDE, or press "r" if you used - // the command line to start the app). - // - // Notice that the counter didn't reset back to zero; the application - // state is not lost during the reload. To reset the state, use hot - // restart instead. - // - // This works for code too, not just values: Most code changes can be - // tested with just a hot reload. - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), - useMaterial3: true, - ), - home: const MyHomePage(title: 'Flutter Demo Home Page'), - ); - } -} - -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key, required this.title}); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - int _counter = 0; - - void _incrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; - }); - } - - @override - Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. - return Scaffold( - appBar: AppBar( - // TRY THIS: Try changing the color here to a specific color (to - // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar - // change color while the other colors stay the same. - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - // - // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint" - // action in the IDE, or press "p" in the console), to see the - // wireframe for each widget. - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headlineMedium, - ), - ], + home: Scaffold( + appBar: AppBar(title: const Text('flutter_rust_bridge quickstart')), + body: Center( + child: Text( + 'Action: Call Rust `greet("Tom")`\nResult: `${greet(name: "Tom")}`'), ), ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. ); } } diff --git a/examples/flutter/example/lib/src/rust/api/simple.dart b/examples/flutter/example/lib/src/rust/api/simple.dart new file mode 100644 index 000000000..7f096a3c9 --- /dev/null +++ b/examples/flutter/example/lib/src/rust/api/simple.dart @@ -0,0 +1,10 @@ +// This file is automatically generated, so please do not edit it. +// @generated by `flutter_rust_bridge`@ 2.5.1. + +// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import + +import '../frb_generated.dart'; +import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; + +String greet({required String name}) => + RustLib.instance.api.crateApiSimpleGreet(name: name); diff --git a/examples/flutter/example/lib/src/rust/frb_generated.dart b/examples/flutter/example/lib/src/rust/frb_generated.dart new file mode 100644 index 000000000..40bf6e1c9 --- /dev/null +++ b/examples/flutter/example/lib/src/rust/frb_generated.dart @@ -0,0 +1,238 @@ +// This file is automatically generated, so please do not edit it. +// @generated by `flutter_rust_bridge`@ 2.5.1. + +// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field + +import 'api/simple.dart'; +import 'dart:async'; +import 'dart:convert'; +import 'frb_generated.dart'; +import 'frb_generated.io.dart' + if (dart.library.js_interop) 'frb_generated.web.dart'; +import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; + +/// Main entrypoint of the Rust API +class RustLib extends BaseEntrypoint { + @internal + static final instance = RustLib._(); + + RustLib._(); + + /// Initialize flutter_rust_bridge + static Future init({ + RustLibApi? api, + BaseHandler? handler, + ExternalLibrary? externalLibrary, + }) async { + await instance.initImpl( + api: api, + handler: handler, + externalLibrary: externalLibrary, + ); + } + + /// Initialize flutter_rust_bridge in mock mode. + /// No libraries for FFI are loaded. + static void initMock({ + required RustLibApi api, + }) { + instance.initMockImpl( + api: api, + ); + } + + /// Dispose flutter_rust_bridge + /// + /// The call to this function is optional, since flutter_rust_bridge (and everything else) + /// is automatically disposed when the app stops. + static void dispose() => instance.disposeImpl(); + + @override + ApiImplConstructor get apiImplConstructor => + RustLibApiImpl.new; + + @override + WireConstructor get wireConstructor => + RustLibWire.fromExternalLibrary; + + @override + Future executeRustInitializers() async { + await api.crateApiSimpleInitApp(); + } + + @override + ExternalLibraryLoaderConfig get defaultExternalLibraryLoaderConfig => + kDefaultExternalLibraryLoaderConfig; + + @override + String get codegenVersion => '2.5.1'; + + @override + int get rustContentHash => -1918914929; + + static const kDefaultExternalLibraryLoaderConfig = + ExternalLibraryLoaderConfig( + stem: 'rust_lib_example', + ioDirectory: 'rust/target/release/', + webPrefix: 'pkg/', + ); +} + +abstract class RustLibApi extends BaseApi { + String crateApiSimpleGreet({required String name}); + + Future crateApiSimpleInitApp(); +} + +class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { + RustLibApiImpl({ + required super.handler, + required super.wire, + required super.generalizedFrbRustBinding, + required super.portManager, + }); + + @override + String crateApiSimpleGreet({required String name}) { + return handler.executeSync(SyncTask( + callFfi: () { + final serializer = SseSerializer(generalizedFrbRustBinding); + sse_encode_String(name, serializer); + return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 1)!; + }, + codec: SseCodec( + decodeSuccessData: sse_decode_String, + decodeErrorData: null, + ), + constMeta: kCrateApiSimpleGreetConstMeta, + argValues: [name], + apiImpl: this, + )); + } + + TaskConstMeta get kCrateApiSimpleGreetConstMeta => const TaskConstMeta( + debugName: "greet", + argNames: ["name"], + ); + + @override + Future crateApiSimpleInitApp() { + return handler.executeNormal(NormalTask( + callFfi: (port_) { + final serializer = SseSerializer(generalizedFrbRustBinding); + pdeCallFfi(generalizedFrbRustBinding, serializer, + funcId: 2, port: port_); + }, + codec: SseCodec( + decodeSuccessData: sse_decode_unit, + decodeErrorData: null, + ), + constMeta: kCrateApiSimpleInitAppConstMeta, + argValues: [], + apiImpl: this, + )); + } + + TaskConstMeta get kCrateApiSimpleInitAppConstMeta => const TaskConstMeta( + debugName: "init_app", + argNames: [], + ); + + @protected + String dco_decode_String(dynamic raw) { + // Codec=Dco (DartCObject based), see doc to use other codecs + return raw as String; + } + + @protected + Uint8List dco_decode_list_prim_u_8_strict(dynamic raw) { + // Codec=Dco (DartCObject based), see doc to use other codecs + return raw as Uint8List; + } + + @protected + int dco_decode_u_8(dynamic raw) { + // Codec=Dco (DartCObject based), see doc to use other codecs + return raw as int; + } + + @protected + void dco_decode_unit(dynamic raw) { + // Codec=Dco (DartCObject based), see doc to use other codecs + return; + } + + @protected + String sse_decode_String(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + var inner = sse_decode_list_prim_u_8_strict(deserializer); + return utf8.decoder.convert(inner); + } + + @protected + Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + var len_ = sse_decode_i_32(deserializer); + return deserializer.buffer.getUint8List(len_); + } + + @protected + int sse_decode_u_8(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + return deserializer.buffer.getUint8(); + } + + @protected + void sse_decode_unit(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + } + + @protected + int sse_decode_i_32(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + return deserializer.buffer.getInt32(); + } + + @protected + bool sse_decode_bool(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + return deserializer.buffer.getUint8() != 0; + } + + @protected + void sse_encode_String(String self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + sse_encode_list_prim_u_8_strict(utf8.encoder.convert(self), serializer); + } + + @protected + void sse_encode_list_prim_u_8_strict( + Uint8List self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + sse_encode_i_32(self.length, serializer); + serializer.buffer.putUint8List(self); + } + + @protected + void sse_encode_u_8(int self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + serializer.buffer.putUint8(self); + } + + @protected + void sse_encode_unit(void self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + } + + @protected + void sse_encode_i_32(int self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + serializer.buffer.putInt32(self); + } + + @protected + void sse_encode_bool(bool self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + serializer.buffer.putUint8(self ? 1 : 0); + } +} diff --git a/examples/flutter/example/lib/src/rust/frb_generated.io.dart b/examples/flutter/example/lib/src/rust/frb_generated.io.dart new file mode 100644 index 000000000..f0efd0130 --- /dev/null +++ b/examples/flutter/example/lib/src/rust/frb_generated.io.dart @@ -0,0 +1,84 @@ +// This file is automatically generated, so please do not edit it. +// @generated by `flutter_rust_bridge`@ 2.5.1. + +// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field + +import 'api/simple.dart'; +import 'dart:async'; +import 'dart:convert'; +import 'dart:ffi' as ffi; +import 'frb_generated.dart'; +import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_io.dart'; + +abstract class RustLibApiImplPlatform extends BaseApiImpl { + RustLibApiImplPlatform({ + required super.handler, + required super.wire, + required super.generalizedFrbRustBinding, + required super.portManager, + }); + + @protected + String dco_decode_String(dynamic raw); + + @protected + Uint8List dco_decode_list_prim_u_8_strict(dynamic raw); + + @protected + int dco_decode_u_8(dynamic raw); + + @protected + void dco_decode_unit(dynamic raw); + + @protected + String sse_decode_String(SseDeserializer deserializer); + + @protected + Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer); + + @protected + int sse_decode_u_8(SseDeserializer deserializer); + + @protected + void sse_decode_unit(SseDeserializer deserializer); + + @protected + int sse_decode_i_32(SseDeserializer deserializer); + + @protected + bool sse_decode_bool(SseDeserializer deserializer); + + @protected + void sse_encode_String(String self, SseSerializer serializer); + + @protected + void sse_encode_list_prim_u_8_strict( + Uint8List self, SseSerializer serializer); + + @protected + void sse_encode_u_8(int self, SseSerializer serializer); + + @protected + void sse_encode_unit(void self, SseSerializer serializer); + + @protected + void sse_encode_i_32(int self, SseSerializer serializer); + + @protected + void sse_encode_bool(bool self, SseSerializer serializer); +} + +// Section: wire_class + +class RustLibWire implements BaseWire { + factory RustLibWire.fromExternalLibrary(ExternalLibrary lib) => + RustLibWire(lib.ffiDynamicLibrary); + + /// Holds the symbol lookup function. + final ffi.Pointer Function(String symbolName) + _lookup; + + /// The symbols are looked up in [dynamicLibrary]. + RustLibWire(ffi.DynamicLibrary dynamicLibrary) + : _lookup = dynamicLibrary.lookup; +} diff --git a/examples/flutter/example/lib/src/rust/frb_generated.web.dart b/examples/flutter/example/lib/src/rust/frb_generated.web.dart new file mode 100644 index 000000000..2b2640718 --- /dev/null +++ b/examples/flutter/example/lib/src/rust/frb_generated.web.dart @@ -0,0 +1,84 @@ +// This file is automatically generated, so please do not edit it. +// @generated by `flutter_rust_bridge`@ 2.5.1. + +// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field + +// Static analysis wrongly picks the IO variant, thus ignore this +// ignore_for_file: argument_type_not_assignable + +import 'api/simple.dart'; +import 'dart:async'; +import 'dart:convert'; +import 'frb_generated.dart'; +import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_web.dart'; + +abstract class RustLibApiImplPlatform extends BaseApiImpl { + RustLibApiImplPlatform({ + required super.handler, + required super.wire, + required super.generalizedFrbRustBinding, + required super.portManager, + }); + + @protected + String dco_decode_String(dynamic raw); + + @protected + Uint8List dco_decode_list_prim_u_8_strict(dynamic raw); + + @protected + int dco_decode_u_8(dynamic raw); + + @protected + void dco_decode_unit(dynamic raw); + + @protected + String sse_decode_String(SseDeserializer deserializer); + + @protected + Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer); + + @protected + int sse_decode_u_8(SseDeserializer deserializer); + + @protected + void sse_decode_unit(SseDeserializer deserializer); + + @protected + int sse_decode_i_32(SseDeserializer deserializer); + + @protected + bool sse_decode_bool(SseDeserializer deserializer); + + @protected + void sse_encode_String(String self, SseSerializer serializer); + + @protected + void sse_encode_list_prim_u_8_strict( + Uint8List self, SseSerializer serializer); + + @protected + void sse_encode_u_8(int self, SseSerializer serializer); + + @protected + void sse_encode_unit(void self, SseSerializer serializer); + + @protected + void sse_encode_i_32(int self, SseSerializer serializer); + + @protected + void sse_encode_bool(bool self, SseSerializer serializer); +} + +// Section: wire_class + +class RustLibWire implements BaseWire { + RustLibWire.fromExternalLibrary(ExternalLibrary lib); +} + +@JS('wasm_bindgen') +external RustLibWasmModule get wasmModule; + +@JS() +@anonymous +extension type RustLibWasmModule._(JSObject _) implements JSObject {} diff --git a/examples/flutter/example/linux/flutter/generated_plugins.cmake b/examples/flutter/example/linux/flutter/generated_plugins.cmake index 2e1de87a7..65773fc1e 100644 --- a/examples/flutter/example/linux/flutter/generated_plugins.cmake +++ b/examples/flutter/example/linux/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + rust_lib_example ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/examples/flutter/example/pubspec.lock b/examples/flutter/example/pubspec.lock index 2223dd9f8..6e6c4917a 100644 --- a/examples/flutter/example/pubspec.lock +++ b/examples/flutter/example/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" + source: hosted + version: "2.6.0" async: dependency: transitive description: @@ -17,6 +25,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + build_cli_annotations: + dependency: transitive + description: + name: build_cli_annotations + sha256: b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172 + url: "https://pub.dev" + source: hosted + version: "2.1.0" characters: dependency: transitive description: @@ -57,11 +73,24 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + file: + dependency: transitive + description: + name: file + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + url: "https://pub.dev" + source: hosted + version: "7.0.0" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_lints: dependency: "direct dev" description: @@ -70,11 +99,29 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + flutter_rust_bridge: + dependency: "direct main" + description: + name: flutter_rust_bridge + sha256: "5fe868d3cb8cbc4d83091748552e03f00ccfa41b8e44691bc382611f831d5f8b" + url: "https://pub.dev" + source: hosted + version: "2.5.1" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" leak_tracker: dependency: transitive description: @@ -139,6 +186,37 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + platform: + dependency: transitive + description: + name: platform + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + process: + dependency: transitive + description: + name: process + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" + url: "https://pub.dev" + source: hosted + version: "5.0.2" + rust_lib_example: + dependency: "direct main" + description: + path: rust_builder + relative: true + source: path + version: "0.0.1" sky_engine: dependency: transitive description: flutter @@ -176,6 +254,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + sync_http: + dependency: transitive + description: + name: sync_http + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" + source: hosted + version: "0.3.1" term_glyph: dependency: transitive description: @@ -208,6 +294,22 @@ packages: url: "https://pub.dev" source: hosted version: "14.2.5" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + webdriver: + dependency: transitive + description: + name: webdriver + sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" + url: "https://pub.dev" + source: hosted + version: "3.0.3" sdks: dart: ">=3.5.0 <4.0.0" flutter: ">=3.24.1" diff --git a/examples/flutter/example/pubspec.yaml b/examples/flutter/example/pubspec.yaml index 91c8db4b8..1dbbd418e 100644 --- a/examples/flutter/example/pubspec.yaml +++ b/examples/flutter/example/pubspec.yaml @@ -12,11 +12,16 @@ dependencies: sdk: flutter cupertino_icons: ^1.0.6 + rust_lib_example: + path: rust_builder + flutter_rust_bridge: 2.5.1 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^3.0.0 + integration_test: + sdk: flutter flutter: uses-material-design: true \ No newline at end of file diff --git a/examples/flutter/example/rust/.gitignore b/examples/flutter/example/rust/.gitignore new file mode 100644 index 000000000..ea8c4bf7f --- /dev/null +++ b/examples/flutter/example/rust/.gitignore @@ -0,0 +1 @@ +/target diff --git a/examples/flutter/example/rust/Cargo.toml b/examples/flutter/example/rust/Cargo.toml new file mode 100644 index 000000000..02114d4e0 --- /dev/null +++ b/examples/flutter/example/rust/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "rust_lib_example" +version = "0.1.0" +edition = "2021" + +[lib] +crate-type = ["cdylib", "staticlib"] + +[dependencies] +flutter_rust_bridge = "=2.5.1" diff --git a/examples/flutter/example/rust/src/api/mod.rs b/examples/flutter/example/rust/src/api/mod.rs new file mode 100644 index 000000000..b252f36bf --- /dev/null +++ b/examples/flutter/example/rust/src/api/mod.rs @@ -0,0 +1 @@ +pub mod simple; diff --git a/examples/flutter/example/rust/src/api/simple.rs b/examples/flutter/example/rust/src/api/simple.rs new file mode 100644 index 000000000..4360c82ae --- /dev/null +++ b/examples/flutter/example/rust/src/api/simple.rs @@ -0,0 +1,10 @@ +#[flutter_rust_bridge::frb(sync)] // Synchronous mode for simplicity of the demo +pub fn greet(name: String) -> String { + format!("Hello, {name}!") +} + +#[flutter_rust_bridge::frb(init)] +pub fn init_app() { + // Default utilities - feel free to customize + flutter_rust_bridge::setup_default_user_utils(); +} diff --git a/examples/flutter/example/rust/src/frb_generated.rs b/examples/flutter/example/rust/src/frb_generated.rs new file mode 100644 index 000000000..c84309268 --- /dev/null +++ b/examples/flutter/example/rust/src/frb_generated.rs @@ -0,0 +1,276 @@ +// This file is automatically generated, so please do not edit it. +// @generated by `flutter_rust_bridge`@ 2.5.1. + +#![allow( + non_camel_case_types, + unused, + non_snake_case, + clippy::needless_return, + clippy::redundant_closure_call, + clippy::redundant_closure, + clippy::useless_conversion, + clippy::unit_arg, + clippy::unused_unit, + clippy::double_parens, + clippy::let_and_return, + clippy::too_many_arguments, + clippy::match_single_binding, + clippy::clone_on_copy, + clippy::let_unit_value, + clippy::deref_addrof, + clippy::explicit_auto_deref, + clippy::borrow_deref_ref, + clippy::needless_borrow +)] + +// Section: imports + +use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt}; +use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; +use flutter_rust_bridge::{Handler, IntoIntoDart}; + +// Section: boilerplate + +flutter_rust_bridge::frb_generated_boilerplate!( + default_stream_sink_codec = SseCodec, + default_rust_opaque = RustOpaqueMoi, + default_rust_auto_opaque = RustAutoOpaqueMoi, +); +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.5.1"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -1918914929; + +// Section: executor + +flutter_rust_bridge::frb_generated_default_handler!(); + +// Section: wire_funcs + +fn wire__crate__api__simple__greet_impl( + ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr, + rust_vec_len_: i32, + data_len_: i32, +) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse { + FLUTTER_RUST_BRIDGE_HANDLER.wrap_sync::( + flutter_rust_bridge::for_generated::TaskInfo { + debug_name: "greet", + port: None, + mode: flutter_rust_bridge::for_generated::FfiCallMode::Sync, + }, + move || { + let message = unsafe { + flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire( + ptr_, + rust_vec_len_, + data_len_, + ) + }; + let mut deserializer = + flutter_rust_bridge::for_generated::SseDeserializer::new(message); + let api_name = ::sse_decode(&mut deserializer); + deserializer.end(); + transform_result_sse::<_, ()>((move || { + let output_ok = Result::<_, ()>::Ok(crate::api::simple::greet(api_name))?; + Ok(output_ok) + })()) + }, + ) +} +fn wire__crate__api__simple__init_app_impl( + port_: flutter_rust_bridge::for_generated::MessagePort, + ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr, + rust_vec_len_: i32, + data_len_: i32, +) { + FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::( + flutter_rust_bridge::for_generated::TaskInfo { + debug_name: "init_app", + port: Some(port_), + mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal, + }, + move || { + let message = unsafe { + flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire( + ptr_, + rust_vec_len_, + data_len_, + ) + }; + let mut deserializer = + flutter_rust_bridge::for_generated::SseDeserializer::new(message); + deserializer.end(); + move |context| { + transform_result_sse::<_, ()>((move || { + let output_ok = Result::<_, ()>::Ok({ + crate::api::simple::init_app(); + })?; + Ok(output_ok) + })()) + } + }, + ) +} + +// Section: dart2rust + +impl SseDecode for String { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { + let mut inner = >::sse_decode(deserializer); + return String::from_utf8(inner).unwrap(); + } +} + +impl SseDecode for Vec { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { + let mut len_ = ::sse_decode(deserializer); + let mut ans_ = vec![]; + for idx_ in 0..len_ { + ans_.push(::sse_decode(deserializer)); + } + return ans_; + } +} + +impl SseDecode for u8 { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { + deserializer.cursor.read_u8().unwrap() + } +} + +impl SseDecode for () { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {} +} + +impl SseDecode for i32 { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { + deserializer.cursor.read_i32::().unwrap() + } +} + +impl SseDecode for bool { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { + deserializer.cursor.read_u8().unwrap() != 0 + } +} + +fn pde_ffi_dispatcher_primary_impl( + func_id: i32, + port: flutter_rust_bridge::for_generated::MessagePort, + ptr: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr, + rust_vec_len: i32, + data_len: i32, +) { + // Codec=Pde (Serialization + dispatch), see doc to use other codecs + match func_id { + 2 => wire__crate__api__simple__init_app_impl(port, ptr, rust_vec_len, data_len), + _ => unreachable!(), + } +} + +fn pde_ffi_dispatcher_sync_impl( + func_id: i32, + ptr: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr, + rust_vec_len: i32, + data_len: i32, +) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse { + // Codec=Pde (Serialization + dispatch), see doc to use other codecs + match func_id { + 1 => wire__crate__api__simple__greet_impl(ptr, rust_vec_len, data_len), + _ => unreachable!(), + } +} + +// Section: rust2dart + +impl SseEncode for String { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { + >::sse_encode(self.into_bytes(), serializer); + } +} + +impl SseEncode for Vec { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { + ::sse_encode(self.len() as _, serializer); + for item in self { + ::sse_encode(item, serializer); + } + } +} + +impl SseEncode for u8 { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { + serializer.cursor.write_u8(self).unwrap(); + } +} + +impl SseEncode for () { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {} +} + +impl SseEncode for i32 { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { + serializer.cursor.write_i32::(self).unwrap(); + } +} + +impl SseEncode for bool { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { + serializer.cursor.write_u8(self as _).unwrap(); + } +} + +#[cfg(not(target_family = "wasm"))] +mod io { + // This file is automatically generated, so please do not edit it. + // @generated by `flutter_rust_bridge`@ 2.5.1. + + // Section: imports + + use super::*; + use flutter_rust_bridge::for_generated::byteorder::{ + NativeEndian, ReadBytesExt, WriteBytesExt, + }; + use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; + use flutter_rust_bridge::{Handler, IntoIntoDart}; + + // Section: boilerplate + + flutter_rust_bridge::frb_generated_boilerplate_io!(); +} +#[cfg(not(target_family = "wasm"))] +pub use io::*; + +/// cbindgen:ignore +#[cfg(target_family = "wasm")] +mod web { + // This file is automatically generated, so please do not edit it. + // @generated by `flutter_rust_bridge`@ 2.5.1. + + // Section: imports + + use super::*; + use flutter_rust_bridge::for_generated::byteorder::{ + NativeEndian, ReadBytesExt, WriteBytesExt, + }; + use flutter_rust_bridge::for_generated::wasm_bindgen; + use flutter_rust_bridge::for_generated::wasm_bindgen::prelude::*; + use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; + use flutter_rust_bridge::{Handler, IntoIntoDart}; + + // Section: boilerplate + + flutter_rust_bridge::frb_generated_boilerplate_web!(); +} +#[cfg(target_family = "wasm")] +pub use web::*; diff --git a/examples/flutter/example/rust/src/lib.rs b/examples/flutter/example/rust/src/lib.rs new file mode 100644 index 000000000..cbb071f8b --- /dev/null +++ b/examples/flutter/example/rust/src/lib.rs @@ -0,0 +1,2 @@ +pub mod api; +mod frb_generated; diff --git a/examples/flutter/example/rust_builder/.gitignore b/examples/flutter/example/rust_builder/.gitignore new file mode 100644 index 000000000..ac5aa9893 --- /dev/null +++ b/examples/flutter/example/rust_builder/.gitignore @@ -0,0 +1,29 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +build/ diff --git a/examples/flutter/example/rust_builder/README.md b/examples/flutter/example/rust_builder/README.md new file mode 100644 index 000000000..922615f9c --- /dev/null +++ b/examples/flutter/example/rust_builder/README.md @@ -0,0 +1 @@ +Please ignore this folder, which is just glue to build Rust with Flutter. \ No newline at end of file diff --git a/examples/flutter/example/rust_builder/android/.gitignore b/examples/flutter/example/rust_builder/android/.gitignore new file mode 100644 index 000000000..161bdcdaf --- /dev/null +++ b/examples/flutter/example/rust_builder/android/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.cxx diff --git a/examples/flutter/example/rust_builder/android/build.gradle b/examples/flutter/example/rust_builder/android/build.gradle new file mode 100644 index 000000000..f5fb3a072 --- /dev/null +++ b/examples/flutter/example/rust_builder/android/build.gradle @@ -0,0 +1,56 @@ +// The Android Gradle Plugin builds the native code with the Android NDK. + +group 'com.flutter_rust_bridge.rust_lib_example' +version '1.0' + +buildscript { + repositories { + google() + mavenCentral() + } + + dependencies { + // The Android Gradle Plugin knows how to build native code with the NDK. + classpath 'com.android.tools.build:gradle:7.3.0' + } +} + +rootProject.allprojects { + repositories { + google() + mavenCentral() + } +} + +apply plugin: 'com.android.library' + +android { + if (project.android.hasProperty("namespace")) { + namespace 'com.flutter_rust_bridge.rust_lib_example' + } + + // Bumping the plugin compileSdkVersion requires all clients of this plugin + // to bump the version in their app. + compileSdkVersion 33 + + // Use the NDK version + // declared in /android/app/build.gradle file of the Flutter project. + // Replace it with a version number if this plugin requires a specfic NDK version. + // (e.g. ndkVersion "23.1.7779620") + ndkVersion android.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + minSdkVersion 19 + } +} + +apply from: "../cargokit/gradle/plugin.gradle" +cargokit { + manifestDir = "../../rust" + libname = "rust_lib_example" +} diff --git a/examples/flutter/example/rust_builder/android/settings.gradle b/examples/flutter/example/rust_builder/android/settings.gradle new file mode 100644 index 000000000..6c763aa7a --- /dev/null +++ b/examples/flutter/example/rust_builder/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'rust_lib_example' diff --git a/examples/flutter/example/rust_builder/android/src/main/AndroidManifest.xml b/examples/flutter/example/rust_builder/android/src/main/AndroidManifest.xml new file mode 100644 index 000000000..b7b7f669b --- /dev/null +++ b/examples/flutter/example/rust_builder/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/examples/flutter/example/rust_builder/cargokit/.gitignore b/examples/flutter/example/rust_builder/cargokit/.gitignore new file mode 100644 index 000000000..cf7bb868c --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/.gitignore @@ -0,0 +1,4 @@ +target +.dart_tool +*.iml +!pubspec.lock diff --git a/examples/flutter/example/rust_builder/cargokit/LICENSE b/examples/flutter/example/rust_builder/cargokit/LICENSE new file mode 100644 index 000000000..d33a5fea5 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/LICENSE @@ -0,0 +1,42 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +Copyright 2022 Matej Knopp + +================================================================================ + +MIT LICENSE + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +================================================================================ + +APACHE LICENSE, VERSION 2.0 + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + diff --git a/examples/flutter/example/rust_builder/cargokit/README b/examples/flutter/example/rust_builder/cargokit/README new file mode 100644 index 000000000..398474dbc --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/README @@ -0,0 +1,11 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +Experimental repository to provide glue for seamlessly integrating cargo build +with flutter plugins and packages. + +See https://matejknopp.com/post/flutter_plugin_in_rust_with_no_prebuilt_binaries/ +for a tutorial on how to use Cargokit. + +Example plugin available at https://github.com/irondash/hello_rust_ffi_plugin. + diff --git a/examples/flutter/example/rust_builder/cargokit/build_pod.sh b/examples/flutter/example/rust_builder/cargokit/build_pod.sh new file mode 100755 index 000000000..ed0e0d987 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_pod.sh @@ -0,0 +1,58 @@ +#!/bin/sh +set -e + +BASEDIR=$(dirname "$0") + +# Workaround for https://github.com/dart-lang/pub/issues/4010 +BASEDIR=$(cd "$BASEDIR" ; pwd -P) + +# Remove XCode SDK from path. Otherwise this breaks tool compilation when building iOS project +NEW_PATH=`echo $PATH | tr ":" "\n" | grep -v "Contents/Developer/" | tr "\n" ":"` + +export PATH=${NEW_PATH%?} # remove trailing : + +env + +# Platform name (macosx, iphoneos, iphonesimulator) +export CARGOKIT_DARWIN_PLATFORM_NAME=$PLATFORM_NAME + +# Arctive architectures (arm64, armv7, x86_64), space separated. +export CARGOKIT_DARWIN_ARCHS=$ARCHS + +# Current build configuration (Debug, Release) +export CARGOKIT_CONFIGURATION=$CONFIGURATION + +# Path to directory containing Cargo.toml. +export CARGOKIT_MANIFEST_DIR=$PODS_TARGET_SRCROOT/$1 + +# Temporary directory for build artifacts. +export CARGOKIT_TARGET_TEMP_DIR=$TARGET_TEMP_DIR + +# Output directory for final artifacts. +export CARGOKIT_OUTPUT_DIR=$PODS_CONFIGURATION_BUILD_DIR/$PRODUCT_NAME + +# Directory to store built tool artifacts. +export CARGOKIT_TOOL_TEMP_DIR=$TARGET_TEMP_DIR/build_tool + +# Directory inside root project. Not necessarily the top level directory of root project. +export CARGOKIT_ROOT_PROJECT_DIR=$SRCROOT + +FLUTTER_EXPORT_BUILD_ENVIRONMENT=( + "$PODS_ROOT/../Flutter/ephemeral/flutter_export_environment.sh" # macOS + "$PODS_ROOT/../Flutter/flutter_export_environment.sh" # iOS +) + +for path in "${FLUTTER_EXPORT_BUILD_ENVIRONMENT[@]}" +do + if [[ -f "$path" ]]; then + source "$path" + fi +done + +sh "$BASEDIR/run_build_tool.sh" build-pod "$@" + +# Make a symlink from built framework to phony file, which will be used as input to +# build script. This should force rebuild (podspec currently doesn't support alwaysOutOfDate +# attribute on custom build phase) +ln -fs "$OBJROOT/XCBuildData/build.db" "${BUILT_PRODUCTS_DIR}/cargokit_phony" +ln -fs "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}" "${BUILT_PRODUCTS_DIR}/cargokit_phony_out" diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/README.md b/examples/flutter/example/rust_builder/cargokit/build_tool/README.md new file mode 100644 index 000000000..a878c2796 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/README.md @@ -0,0 +1,5 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +A sample command-line application with an entrypoint in `bin/`, library code +in `lib/`, and example unit test in `test/`. diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/analysis_options.yaml b/examples/flutter/example/rust_builder/cargokit/build_tool/analysis_options.yaml new file mode 100644 index 000000000..0e16a8b09 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/analysis_options.yaml @@ -0,0 +1,34 @@ +# This is copied from Cargokit (which is the official way to use it currently) +# Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +# This file configures the static analysis results for your project (errors, +# warnings, and lints). +# +# This enables the 'recommended' set of lints from `package:lints`. +# This set helps identify many issues that may lead to problems when running +# or consuming Dart code, and enforces writing Dart using a single, idiomatic +# style and format. +# +# If you want a smaller set of lints you can change this to specify +# 'package:lints/core.yaml'. These are just the most critical lints +# (the recommended set includes the core lints). +# The core lints are also what is used by pub.dev for scoring packages. + +include: package:lints/recommended.yaml + +# Uncomment the following section to specify additional rules. + +linter: + rules: + - prefer_relative_imports + - directives_ordering + +# analyzer: +# exclude: +# - path/to/excluded/files/** + +# For more information about the core and recommended set of lints, see +# https://dart.dev/go/core-lints + +# For additional information about configuring this file, see +# https://dart.dev/guides/language/analysis-options diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/build_tool.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/build_tool.dart new file mode 100644 index 000000000..7c1bb750a --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/build_tool.dart @@ -0,0 +1,8 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'src/build_tool.dart' as build_tool; + +Future runMain(List args) async { + return build_tool.runMain(args); +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/android_environment.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/android_environment.dart new file mode 100644 index 000000000..15fc9eeda --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/android_environment.dart @@ -0,0 +1,195 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; +import 'dart:isolate'; +import 'dart:math' as math; + +import 'package:collection/collection.dart'; +import 'package:path/path.dart' as path; +import 'package:version/version.dart'; + +import 'target.dart'; +import 'util.dart'; + +class AndroidEnvironment { + AndroidEnvironment({ + required this.sdkPath, + required this.ndkVersion, + required this.minSdkVersion, + required this.targetTempDir, + required this.target, + }); + + static void clangLinkerWrapper(List args) { + final clang = Platform.environment['_CARGOKIT_NDK_LINK_CLANG']; + if (clang == null) { + throw Exception( + "cargo-ndk rustc linker: didn't find _CARGOKIT_NDK_LINK_CLANG env var"); + } + final target = Platform.environment['_CARGOKIT_NDK_LINK_TARGET']; + if (target == null) { + throw Exception( + "cargo-ndk rustc linker: didn't find _CARGOKIT_NDK_LINK_TARGET env var"); + } + + runCommand(clang, [ + target, + ...args, + ]); + } + + /// Full path to Android SDK. + final String sdkPath; + + /// Full version of Android NDK. + final String ndkVersion; + + /// Minimum supported SDK version. + final int minSdkVersion; + + /// Target directory for build artifacts. + final String targetTempDir; + + /// Target being built. + final Target target; + + bool ndkIsInstalled() { + final ndkPath = path.join(sdkPath, 'ndk', ndkVersion); + final ndkPackageXml = File(path.join(ndkPath, 'package.xml')); + return ndkPackageXml.existsSync(); + } + + void installNdk({ + required String javaHome, + }) { + final sdkManagerExtension = Platform.isWindows ? '.bat' : ''; + final sdkManager = path.join( + sdkPath, + 'cmdline-tools', + 'latest', + 'bin', + 'sdkmanager$sdkManagerExtension', + ); + + log.info('Installing NDK $ndkVersion'); + runCommand(sdkManager, [ + '--install', + 'ndk;$ndkVersion', + ], environment: { + 'JAVA_HOME': javaHome, + }); + } + + Future> buildEnvironment() async { + final hostArch = Platform.isMacOS + ? "darwin-x86_64" + : (Platform.isLinux ? "linux-x86_64" : "windows-x86_64"); + + final ndkPath = path.join(sdkPath, 'ndk', ndkVersion); + final toolchainPath = path.join( + ndkPath, + 'toolchains', + 'llvm', + 'prebuilt', + hostArch, + 'bin', + ); + + final minSdkVersion = + math.max(target.androidMinSdkVersion!, this.minSdkVersion); + + final exe = Platform.isWindows ? '.exe' : ''; + + final arKey = 'AR_${target.rust}'; + final arValue = ['${target.rust}-ar', 'llvm-ar', 'llvm-ar.exe'] + .map((e) => path.join(toolchainPath, e)) + .firstWhereOrNull((element) => File(element).existsSync()); + if (arValue == null) { + throw Exception('Failed to find ar for $target in $toolchainPath'); + } + + final targetArg = '--target=${target.rust}$minSdkVersion'; + + final ccKey = 'CC_${target.rust}'; + final ccValue = path.join(toolchainPath, 'clang$exe'); + final cfFlagsKey = 'CFLAGS_${target.rust}'; + final cFlagsValue = targetArg; + + final cxxKey = 'CXX_${target.rust}'; + final cxxValue = path.join(toolchainPath, 'clang++$exe'); + final cxxFlagsKey = 'CXXFLAGS_${target.rust}'; + final cxxFlagsValue = targetArg; + + final linkerKey = + 'cargo_target_${target.rust.replaceAll('-', '_')}_linker'.toUpperCase(); + + final ranlibKey = 'RANLIB_${target.rust}'; + final ranlibValue = path.join(toolchainPath, 'llvm-ranlib$exe'); + + final ndkVersionParsed = Version.parse(ndkVersion); + final rustFlagsKey = 'CARGO_ENCODED_RUSTFLAGS'; + final rustFlagsValue = _libGccWorkaround(targetTempDir, ndkVersionParsed); + + final runRustTool = + Platform.isWindows ? 'run_build_tool.cmd' : 'run_build_tool.sh'; + + final packagePath = (await Isolate.resolvePackageUri( + Uri.parse('package:build_tool/buildtool.dart')))! + .toFilePath(); + final selfPath = path.canonicalize(path.join( + packagePath, + '..', + '..', + '..', + runRustTool, + )); + + // Make sure that run_build_tool is working properly even initially launched directly + // through dart run. + final toolTempDir = + Platform.environment['CARGOKIT_TOOL_TEMP_DIR'] ?? targetTempDir; + + return { + arKey: arValue, + ccKey: ccValue, + cfFlagsKey: cFlagsValue, + cxxKey: cxxValue, + cxxFlagsKey: cxxFlagsValue, + ranlibKey: ranlibValue, + rustFlagsKey: rustFlagsValue, + linkerKey: selfPath, + // Recognized by main() so we know when we're acting as a wrapper + '_CARGOKIT_NDK_LINK_TARGET': targetArg, + '_CARGOKIT_NDK_LINK_CLANG': ccValue, + 'CARGOKIT_TOOL_TEMP_DIR': toolTempDir, + }; + } + + // Workaround for libgcc missing in NDK23, inspired by cargo-ndk + String _libGccWorkaround(String buildDir, Version ndkVersion) { + final workaroundDir = path.join( + buildDir, + 'cargokit', + 'libgcc_workaround', + '${ndkVersion.major}', + ); + Directory(workaroundDir).createSync(recursive: true); + if (ndkVersion.major >= 23) { + File(path.join(workaroundDir, 'libgcc.a')) + .writeAsStringSync('INPUT(-lunwind)'); + } else { + // Other way around, untested, forward libgcc.a from libunwind once Rust + // gets updated for NDK23+. + File(path.join(workaroundDir, 'libunwind.a')) + .writeAsStringSync('INPUT(-lgcc)'); + } + + var rustFlags = Platform.environment['CARGO_ENCODED_RUSTFLAGS'] ?? ''; + if (rustFlags.isNotEmpty) { + rustFlags = '$rustFlags\x1f'; + } + rustFlags = '$rustFlags-L\x1f$workaroundDir'; + return rustFlags; + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart new file mode 100644 index 000000000..e608cece7 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart @@ -0,0 +1,266 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:ed25519_edwards/ed25519_edwards.dart'; +import 'package:http/http.dart'; +import 'package:logging/logging.dart'; +import 'package:path/path.dart' as path; + +import 'builder.dart'; +import 'crate_hash.dart'; +import 'options.dart'; +import 'precompile_binaries.dart'; +import 'rustup.dart'; +import 'target.dart'; + +class Artifact { + /// File system location of the artifact. + final String path; + + /// Actual file name that the artifact should have in destination folder. + final String finalFileName; + + AritifactType get type { + if (finalFileName.endsWith('.dll') || + finalFileName.endsWith('.dll.lib') || + finalFileName.endsWith('.pdb') || + finalFileName.endsWith('.so') || + finalFileName.endsWith('.dylib')) { + return AritifactType.dylib; + } else if (finalFileName.endsWith('.lib') || finalFileName.endsWith('.a')) { + return AritifactType.staticlib; + } else { + throw Exception('Unknown artifact type for $finalFileName'); + } + } + + Artifact({ + required this.path, + required this.finalFileName, + }); +} + +final _log = Logger('artifacts_provider'); + +class ArtifactProvider { + ArtifactProvider({ + required this.environment, + required this.userOptions, + }); + + final BuildEnvironment environment; + final CargokitUserOptions userOptions; + + Future>> getArtifacts(List targets) async { + final result = await _getPrecompiledArtifacts(targets); + + final pendingTargets = List.of(targets); + pendingTargets.removeWhere((element) => result.containsKey(element)); + + if (pendingTargets.isEmpty) { + return result; + } + + final rustup = Rustup(); + for (final target in targets) { + final builder = RustBuilder(target: target, environment: environment); + builder.prepare(rustup); + _log.info('Building ${environment.crateInfo.packageName} for $target'); + final targetDir = await builder.build(); + // For local build accept both static and dynamic libraries. + final artifactNames = { + ...getArtifactNames( + target: target, + libraryName: environment.crateInfo.packageName, + aritifactType: AritifactType.dylib, + remote: false, + ), + ...getArtifactNames( + target: target, + libraryName: environment.crateInfo.packageName, + aritifactType: AritifactType.staticlib, + remote: false, + ) + }; + final artifacts = artifactNames + .map((artifactName) => Artifact( + path: path.join(targetDir, artifactName), + finalFileName: artifactName, + )) + .where((element) => File(element.path).existsSync()) + .toList(); + result[target] = artifacts; + } + return result; + } + + Future>> _getPrecompiledArtifacts( + List targets) async { + if (userOptions.usePrecompiledBinaries == false) { + _log.info('Precompiled binaries are disabled'); + return {}; + } + if (environment.crateOptions.precompiledBinaries == null) { + _log.fine('Precompiled binaries not enabled for this crate'); + return {}; + } + + final start = Stopwatch()..start(); + final crateHash = CrateHash.compute(environment.manifestDir, + tempStorage: environment.targetTempDir); + _log.fine( + 'Computed crate hash $crateHash in ${start.elapsedMilliseconds}ms'); + + final downloadedArtifactsDir = + path.join(environment.targetTempDir, 'precompiled', crateHash); + Directory(downloadedArtifactsDir).createSync(recursive: true); + + final res = >{}; + + for (final target in targets) { + final requiredArtifacts = getArtifactNames( + target: target, + libraryName: environment.crateInfo.packageName, + remote: true, + ); + final artifactsForTarget = []; + + for (final artifact in requiredArtifacts) { + final fileName = PrecompileBinaries.fileName(target, artifact); + final downloadedPath = path.join(downloadedArtifactsDir, fileName); + if (!File(downloadedPath).existsSync()) { + final signatureFileName = + PrecompileBinaries.signatureFileName(target, artifact); + await _tryDownloadArtifacts( + crateHash: crateHash, + fileName: fileName, + signatureFileName: signatureFileName, + finalPath: downloadedPath, + ); + } + if (File(downloadedPath).existsSync()) { + artifactsForTarget.add(Artifact( + path: downloadedPath, + finalFileName: artifact, + )); + } else { + break; + } + } + + // Only provide complete set of artifacts. + if (artifactsForTarget.length == requiredArtifacts.length) { + _log.fine('Found precompiled artifacts for $target'); + res[target] = artifactsForTarget; + } + } + + return res; + } + + static Future _get(Uri url, {Map? headers}) async { + int attempt = 0; + const maxAttempts = 10; + while (true) { + try { + return await get(url, headers: headers); + } on SocketException catch (e) { + // Try to detect reset by peer error and retry. + if (attempt++ < maxAttempts && + (e.osError?.errorCode == 54 || e.osError?.errorCode == 10054)) { + _log.severe( + 'Failed to download $url: $e, attempt $attempt of $maxAttempts, will retry...'); + await Future.delayed(Duration(seconds: 1)); + continue; + } else { + rethrow; + } + } + } + } + + Future _tryDownloadArtifacts({ + required String crateHash, + required String fileName, + required String signatureFileName, + required String finalPath, + }) async { + final precompiledBinaries = environment.crateOptions.precompiledBinaries!; + final prefix = precompiledBinaries.uriPrefix; + final url = Uri.parse('$prefix$crateHash/$fileName'); + final signatureUrl = Uri.parse('$prefix$crateHash/$signatureFileName'); + _log.fine('Downloading signature from $signatureUrl'); + final signature = await _get(signatureUrl); + if (signature.statusCode == 404) { + _log.warning( + 'Precompiled binaries not available for crate hash $crateHash ($fileName)'); + return; + } + if (signature.statusCode != 200) { + _log.severe( + 'Failed to download signature $signatureUrl: status ${signature.statusCode}'); + return; + } + _log.fine('Downloading binary from $url'); + final res = await _get(url); + if (res.statusCode != 200) { + _log.severe('Failed to download binary $url: status ${res.statusCode}'); + return; + } + if (verify( + precompiledBinaries.publicKey, res.bodyBytes, signature.bodyBytes)) { + File(finalPath).writeAsBytesSync(res.bodyBytes); + } else { + _log.shout('Signature verification failed! Ignoring binary.'); + } + } +} + +enum AritifactType { + staticlib, + dylib, +} + +AritifactType artifactTypeForTarget(Target target) { + if (target.darwinPlatform != null) { + return AritifactType.staticlib; + } else { + return AritifactType.dylib; + } +} + +List getArtifactNames({ + required Target target, + required String libraryName, + required bool remote, + AritifactType? aritifactType, +}) { + aritifactType ??= artifactTypeForTarget(target); + if (target.darwinArch != null) { + if (aritifactType == AritifactType.staticlib) { + return ['lib$libraryName.a']; + } else { + return ['lib$libraryName.dylib']; + } + } else if (target.rust.contains('-windows-')) { + if (aritifactType == AritifactType.staticlib) { + return ['$libraryName.lib']; + } else { + return [ + '$libraryName.dll', + '$libraryName.dll.lib', + if (!remote) '$libraryName.pdb' + ]; + } + } else if (target.rust.contains('-linux-')) { + if (aritifactType == AritifactType.staticlib) { + return ['lib$libraryName.a']; + } else { + return ['lib$libraryName.so']; + } + } else { + throw Exception("Unsupported target: ${target.rust}"); + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart new file mode 100644 index 000000000..6f3b2a4ec --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart @@ -0,0 +1,40 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:path/path.dart' as path; + +import 'artifacts_provider.dart'; +import 'builder.dart'; +import 'environment.dart'; +import 'options.dart'; +import 'target.dart'; + +class BuildCMake { + final CargokitUserOptions userOptions; + + BuildCMake({required this.userOptions}); + + Future build() async { + final targetPlatform = Environment.targetPlatform; + final target = Target.forFlutterName(Environment.targetPlatform); + if (target == null) { + throw Exception("Unknown target platform: $targetPlatform"); + } + + final environment = BuildEnvironment.fromEnvironment(isAndroid: false); + final provider = + ArtifactProvider(environment: environment, userOptions: userOptions); + final artifacts = await provider.getArtifacts([target]); + + final libs = artifacts[target]!; + + for (final lib in libs) { + if (lib.type == AritifactType.dylib) { + File(lib.path) + .copySync(path.join(Environment.outputDir, lib.finalFileName)); + } + } + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart new file mode 100644 index 000000000..7e61fcbb7 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart @@ -0,0 +1,49 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:logging/logging.dart'; +import 'package:path/path.dart' as path; + +import 'artifacts_provider.dart'; +import 'builder.dart'; +import 'environment.dart'; +import 'options.dart'; +import 'target.dart'; + +final log = Logger('build_gradle'); + +class BuildGradle { + BuildGradle({required this.userOptions}); + + final CargokitUserOptions userOptions; + + Future build() async { + final targets = Environment.targetPlatforms.map((arch) { + final target = Target.forFlutterName(arch); + if (target == null) { + throw Exception( + "Unknown darwin target or platform: $arch, ${Environment.darwinPlatformName}"); + } + return target; + }).toList(); + + final environment = BuildEnvironment.fromEnvironment(isAndroid: true); + final provider = + ArtifactProvider(environment: environment, userOptions: userOptions); + final artifacts = await provider.getArtifacts(targets); + + for (final target in targets) { + final libs = artifacts[target]!; + final outputDir = path.join(Environment.outputDir, target.android!); + Directory(outputDir).createSync(recursive: true); + + for (final lib in libs) { + if (lib.type == AritifactType.dylib) { + File(lib.path).copySync(path.join(outputDir, lib.finalFileName)); + } + } + } + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_pod.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_pod.dart new file mode 100644 index 000000000..8a9c0db5d --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_pod.dart @@ -0,0 +1,89 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:path/path.dart' as path; + +import 'artifacts_provider.dart'; +import 'builder.dart'; +import 'environment.dart'; +import 'options.dart'; +import 'target.dart'; +import 'util.dart'; + +class BuildPod { + BuildPod({required this.userOptions}); + + final CargokitUserOptions userOptions; + + Future build() async { + final targets = Environment.darwinArchs.map((arch) { + final target = Target.forDarwin( + platformName: Environment.darwinPlatformName, darwinAarch: arch); + if (target == null) { + throw Exception( + "Unknown darwin target or platform: $arch, ${Environment.darwinPlatformName}"); + } + return target; + }).toList(); + + final environment = BuildEnvironment.fromEnvironment(isAndroid: false); + final provider = + ArtifactProvider(environment: environment, userOptions: userOptions); + final artifacts = await provider.getArtifacts(targets); + + void performLipo(String targetFile, Iterable sourceFiles) { + runCommand("lipo", [ + '-create', + ...sourceFiles, + '-output', + targetFile, + ]); + } + + final outputDir = Environment.outputDir; + + Directory(outputDir).createSync(recursive: true); + + final staticLibs = artifacts.values + .expand((element) => element) + .where((element) => element.type == AritifactType.staticlib) + .toList(); + final dynamicLibs = artifacts.values + .expand((element) => element) + .where((element) => element.type == AritifactType.dylib) + .toList(); + + final libName = environment.crateInfo.packageName; + + // If there is static lib, use it and link it with pod + if (staticLibs.isNotEmpty) { + final finalTargetFile = path.join(outputDir, "lib$libName.a"); + performLipo(finalTargetFile, staticLibs.map((e) => e.path)); + } else { + // Otherwise try to replace bundle dylib with our dylib + final bundlePaths = [ + '$libName.framework/Versions/A/$libName', + '$libName.framework/$libName', + ]; + + for (final bundlePath in bundlePaths) { + final targetFile = path.join(outputDir, bundlePath); + if (File(targetFile).existsSync()) { + performLipo(targetFile, dynamicLibs.map((e) => e.path)); + + // Replace absolute id with @rpath one so that it works properly + // when moved to Frameworks. + runCommand("install_name_tool", [ + '-id', + '@rpath/$bundlePath', + targetFile, + ]); + return; + } + } + throw Exception('Unable to find bundle for dynamic library'); + } + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_tool.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_tool.dart new file mode 100644 index 000000000..c8f36981b --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/build_tool.dart @@ -0,0 +1,271 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:args/command_runner.dart'; +import 'package:ed25519_edwards/ed25519_edwards.dart'; +import 'package:github/github.dart'; +import 'package:hex/hex.dart'; +import 'package:logging/logging.dart'; + +import 'android_environment.dart'; +import 'build_cmake.dart'; +import 'build_gradle.dart'; +import 'build_pod.dart'; +import 'logging.dart'; +import 'options.dart'; +import 'precompile_binaries.dart'; +import 'target.dart'; +import 'util.dart'; +import 'verify_binaries.dart'; + +final log = Logger('build_tool'); + +abstract class BuildCommand extends Command { + Future runBuildCommand(CargokitUserOptions options); + + @override + Future run() async { + final options = CargokitUserOptions.load(); + + if (options.verboseLogging || + Platform.environment['CARGOKIT_VERBOSE'] == '1') { + enableVerboseLogging(); + } + + await runBuildCommand(options); + } +} + +class BuildPodCommand extends BuildCommand { + @override + final name = 'build-pod'; + + @override + final description = 'Build cocoa pod library'; + + @override + Future runBuildCommand(CargokitUserOptions options) async { + final build = BuildPod(userOptions: options); + await build.build(); + } +} + +class BuildGradleCommand extends BuildCommand { + @override + final name = 'build-gradle'; + + @override + final description = 'Build android library'; + + @override + Future runBuildCommand(CargokitUserOptions options) async { + final build = BuildGradle(userOptions: options); + await build.build(); + } +} + +class BuildCMakeCommand extends BuildCommand { + @override + final name = 'build-cmake'; + + @override + final description = 'Build CMake library'; + + @override + Future runBuildCommand(CargokitUserOptions options) async { + final build = BuildCMake(userOptions: options); + await build.build(); + } +} + +class GenKeyCommand extends Command { + @override + final name = 'gen-key'; + + @override + final description = 'Generate key pair for signing precompiled binaries'; + + @override + void run() { + final kp = generateKey(); + final private = HEX.encode(kp.privateKey.bytes); + final public = HEX.encode(kp.publicKey.bytes); + print("Private Key: $private"); + print("Public Key: $public"); + } +} + +class PrecompileBinariesCommand extends Command { + PrecompileBinariesCommand() { + argParser + ..addOption( + 'repository', + mandatory: true, + help: 'Github repository slug in format owner/name', + ) + ..addOption( + 'manifest-dir', + mandatory: true, + help: 'Directory containing Cargo.toml', + ) + ..addMultiOption('target', + help: 'Rust target triple of artifact to build.\n' + 'Can be specified multiple times or omitted in which case\n' + 'all targets for current platform will be built.') + ..addOption( + 'android-sdk-location', + help: 'Location of Android SDK (if available)', + ) + ..addOption( + 'android-ndk-version', + help: 'Android NDK version (if available)', + ) + ..addOption( + 'android-min-sdk-version', + help: 'Android minimum rquired version (if available)', + ) + ..addOption( + 'temp-dir', + help: 'Directory to store temporary build artifacts', + ) + ..addFlag( + "verbose", + abbr: "v", + defaultsTo: false, + help: "Enable verbose logging", + ); + } + + @override + final name = 'precompile-binaries'; + + @override + final description = 'Prebuild and upload binaries\n' + 'Private key must be passed through PRIVATE_KEY environment variable. ' + 'Use gen_key through generate priave key.\n' + 'Github token must be passed as GITHUB_TOKEN environment variable.\n'; + + @override + Future run() async { + final verbose = argResults!['verbose'] as bool; + if (verbose) { + enableVerboseLogging(); + } + + final privateKeyString = Platform.environment['PRIVATE_KEY']; + if (privateKeyString == null) { + throw ArgumentError('Missing PRIVATE_KEY environment variable'); + } + final githubToken = Platform.environment['GITHUB_TOKEN']; + if (githubToken == null) { + throw ArgumentError('Missing GITHUB_TOKEN environment variable'); + } + final privateKey = HEX.decode(privateKeyString); + if (privateKey.length != 64) { + throw ArgumentError('Private key must be 64 bytes long'); + } + final manifestDir = argResults!['manifest-dir'] as String; + if (!Directory(manifestDir).existsSync()) { + throw ArgumentError('Manifest directory does not exist: $manifestDir'); + } + String? androidMinSdkVersionString = + argResults!['android-min-sdk-version'] as String?; + int? androidMinSdkVersion; + if (androidMinSdkVersionString != null) { + androidMinSdkVersion = int.tryParse(androidMinSdkVersionString); + if (androidMinSdkVersion == null) { + throw ArgumentError( + 'Invalid android-min-sdk-version: $androidMinSdkVersionString'); + } + } + final targetStrigns = argResults!['target'] as List; + final targets = targetStrigns.map((target) { + final res = Target.forRustTriple(target); + if (res == null) { + throw ArgumentError('Invalid target: $target'); + } + return res; + }).toList(growable: false); + final precompileBinaries = PrecompileBinaries( + privateKey: PrivateKey(privateKey), + githubToken: githubToken, + manifestDir: manifestDir, + repositorySlug: RepositorySlug.full(argResults!['repository'] as String), + targets: targets, + androidSdkLocation: argResults!['android-sdk-location'] as String?, + androidNdkVersion: argResults!['android-ndk-version'] as String?, + androidMinSdkVersion: androidMinSdkVersion, + tempDir: argResults!['temp-dir'] as String?, + ); + + await precompileBinaries.run(); + } +} + +class VerifyBinariesCommand extends Command { + VerifyBinariesCommand() { + argParser.addOption( + 'manifest-dir', + mandatory: true, + help: 'Directory containing Cargo.toml', + ); + } + + @override + final name = "verify-binaries"; + + @override + final description = 'Verifies published binaries\n' + 'Checks whether there is a binary published for each targets\n' + 'and checks the signature.'; + + @override + Future run() async { + final manifestDir = argResults!['manifest-dir'] as String; + final verifyBinaries = VerifyBinaries( + manifestDir: manifestDir, + ); + await verifyBinaries.run(); + } +} + +Future runMain(List args) async { + try { + // Init logging before options are loaded + initLogging(); + + if (Platform.environment['_CARGOKIT_NDK_LINK_TARGET'] != null) { + return AndroidEnvironment.clangLinkerWrapper(args); + } + + final runner = CommandRunner('build_tool', 'Cargokit built_tool') + ..addCommand(BuildPodCommand()) + ..addCommand(BuildGradleCommand()) + ..addCommand(BuildCMakeCommand()) + ..addCommand(GenKeyCommand()) + ..addCommand(PrecompileBinariesCommand()) + ..addCommand(VerifyBinariesCommand()); + + await runner.run(args); + } on ArgumentError catch (e) { + stderr.writeln(e.toString()); + exit(1); + } catch (e, s) { + log.severe(kDoubleSeparator); + log.severe('Cargokit BuildTool failed with error:'); + log.severe(kSeparator); + log.severe(e); + // This tells user to install Rust, there's no need to pollute the log with + // stack trace. + if (e is! RustupNotFoundException) { + log.severe(kSeparator); + log.severe(s); + log.severe(kSeparator); + log.severe('BuildTool arguments: $args'); + } + log.severe(kDoubleSeparator); + exit(1); + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/builder.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/builder.dart new file mode 100644 index 000000000..84c46e4f5 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/builder.dart @@ -0,0 +1,198 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'package:collection/collection.dart'; +import 'package:logging/logging.dart'; +import 'package:path/path.dart' as path; + +import 'android_environment.dart'; +import 'cargo.dart'; +import 'environment.dart'; +import 'options.dart'; +import 'rustup.dart'; +import 'target.dart'; +import 'util.dart'; + +final _log = Logger('builder'); + +enum BuildConfiguration { + debug, + release, + profile, +} + +extension on BuildConfiguration { + bool get isDebug => this == BuildConfiguration.debug; + String get rustName => switch (this) { + BuildConfiguration.debug => 'debug', + BuildConfiguration.release => 'release', + BuildConfiguration.profile => 'release', + }; +} + +class BuildException implements Exception { + final String message; + + BuildException(this.message); + + @override + String toString() { + return 'BuildException: $message'; + } +} + +class BuildEnvironment { + final BuildConfiguration configuration; + final CargokitCrateOptions crateOptions; + final String targetTempDir; + final String manifestDir; + final CrateInfo crateInfo; + + final bool isAndroid; + final String? androidSdkPath; + final String? androidNdkVersion; + final int? androidMinSdkVersion; + final String? javaHome; + + BuildEnvironment({ + required this.configuration, + required this.crateOptions, + required this.targetTempDir, + required this.manifestDir, + required this.crateInfo, + required this.isAndroid, + this.androidSdkPath, + this.androidNdkVersion, + this.androidMinSdkVersion, + this.javaHome, + }); + + static BuildConfiguration parseBuildConfiguration(String value) { + // XCode configuration adds the flavor to configuration name. + final firstSegment = value.split('-').first; + final buildConfiguration = BuildConfiguration.values.firstWhereOrNull( + (e) => e.name == firstSegment, + ); + if (buildConfiguration == null) { + _log.warning('Unknown build configuraiton $value, will assume release'); + return BuildConfiguration.release; + } + return buildConfiguration; + } + + static BuildEnvironment fromEnvironment({ + required bool isAndroid, + }) { + final buildConfiguration = + parseBuildConfiguration(Environment.configuration); + final manifestDir = Environment.manifestDir; + final crateOptions = CargokitCrateOptions.load( + manifestDir: manifestDir, + ); + final crateInfo = CrateInfo.load(manifestDir); + return BuildEnvironment( + configuration: buildConfiguration, + crateOptions: crateOptions, + targetTempDir: Environment.targetTempDir, + manifestDir: manifestDir, + crateInfo: crateInfo, + isAndroid: isAndroid, + androidSdkPath: isAndroid ? Environment.sdkPath : null, + androidNdkVersion: isAndroid ? Environment.ndkVersion : null, + androidMinSdkVersion: + isAndroid ? int.parse(Environment.minSdkVersion) : null, + javaHome: isAndroid ? Environment.javaHome : null, + ); + } +} + +class RustBuilder { + final Target target; + final BuildEnvironment environment; + + RustBuilder({ + required this.target, + required this.environment, + }); + + void prepare( + Rustup rustup, + ) { + final toolchain = _toolchain; + if (rustup.installedTargets(toolchain) == null) { + rustup.installToolchain(toolchain); + } + if (toolchain == 'nightly') { + rustup.installRustSrcForNightly(); + } + if (!rustup.installedTargets(toolchain)!.contains(target.rust)) { + rustup.installTarget(target.rust, toolchain: toolchain); + } + } + + CargoBuildOptions? get _buildOptions => + environment.crateOptions.cargo[environment.configuration]; + + String get _toolchain => _buildOptions?.toolchain.name ?? 'stable'; + + /// Returns the path of directory containing build artifacts. + Future build() async { + final extraArgs = _buildOptions?.flags ?? []; + final manifestPath = path.join(environment.manifestDir, 'Cargo.toml'); + runCommand( + 'rustup', + [ + 'run', + _toolchain, + 'cargo', + 'build', + ...extraArgs, + '--manifest-path', + manifestPath, + '-p', + environment.crateInfo.packageName, + if (!environment.configuration.isDebug) '--release', + '--target', + target.rust, + '--target-dir', + environment.targetTempDir, + ], + environment: await _buildEnvironment(), + ); + return path.join( + environment.targetTempDir, + target.rust, + environment.configuration.rustName, + ); + } + + Future> _buildEnvironment() async { + if (target.android == null) { + return {}; + } else { + final sdkPath = environment.androidSdkPath; + final ndkVersion = environment.androidNdkVersion; + final minSdkVersion = environment.androidMinSdkVersion; + if (sdkPath == null) { + throw BuildException('androidSdkPath is not set'); + } + if (ndkVersion == null) { + throw BuildException('androidNdkVersion is not set'); + } + if (minSdkVersion == null) { + throw BuildException('androidMinSdkVersion is not set'); + } + final env = AndroidEnvironment( + sdkPath: sdkPath, + ndkVersion: ndkVersion, + minSdkVersion: minSdkVersion, + targetTempDir: environment.targetTempDir, + target: target, + ); + if (!env.ndkIsInstalled() && environment.javaHome != null) { + env.installNdk(javaHome: environment.javaHome!); + } + return env.buildEnvironment(); + } + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/cargo.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/cargo.dart new file mode 100644 index 000000000..0d8958ff2 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/cargo.dart @@ -0,0 +1,48 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:path/path.dart' as path; +import 'package:toml/toml.dart'; + +class ManifestException { + ManifestException(this.message, {required this.fileName}); + + final String? fileName; + final String message; + + @override + String toString() { + if (fileName != null) { + return 'Failed to parse package manifest at $fileName: $message'; + } else { + return 'Failed to parse package manifest: $message'; + } + } +} + +class CrateInfo { + CrateInfo({required this.packageName}); + + final String packageName; + + static CrateInfo parseManifest(String manifest, {final String? fileName}) { + final toml = TomlDocument.parse(manifest); + final package = toml.toMap()['package']; + if (package == null) { + throw ManifestException('Missing package section', fileName: fileName); + } + final name = package['name']; + if (name == null) { + throw ManifestException('Missing package name', fileName: fileName); + } + return CrateInfo(packageName: name); + } + + static CrateInfo load(String manifestDir) { + final manifestFile = File(path.join(manifestDir, 'Cargo.toml')); + final manifest = manifestFile.readAsStringSync(); + return parseManifest(manifest, fileName: manifestFile.path); + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart new file mode 100644 index 000000000..0c4d88d16 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart @@ -0,0 +1,124 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:convert'; +import 'dart:io'; +import 'dart:typed_data'; + +import 'package:collection/collection.dart'; +import 'package:convert/convert.dart'; +import 'package:crypto/crypto.dart'; +import 'package:path/path.dart' as path; + +class CrateHash { + /// Computes a hash uniquely identifying crate content. This takes into account + /// content all all .rs files inside the src directory, as well as Cargo.toml, + /// Cargo.lock, build.rs and cargokit.yaml. + /// + /// If [tempStorage] is provided, computed hash is stored in a file in that directory + /// and reused on subsequent calls if the crate content hasn't changed. + static String compute(String manifestDir, {String? tempStorage}) { + return CrateHash._( + manifestDir: manifestDir, + tempStorage: tempStorage, + )._compute(); + } + + CrateHash._({ + required this.manifestDir, + required this.tempStorage, + }); + + String _compute() { + final files = getFiles(); + final tempStorage = this.tempStorage; + if (tempStorage != null) { + final quickHash = _computeQuickHash(files); + final quickHashFolder = Directory(path.join(tempStorage, 'crate_hash')); + quickHashFolder.createSync(recursive: true); + final quickHashFile = File(path.join(quickHashFolder.path, quickHash)); + if (quickHashFile.existsSync()) { + return quickHashFile.readAsStringSync(); + } + final hash = _computeHash(files); + quickHashFile.writeAsStringSync(hash); + return hash; + } else { + return _computeHash(files); + } + } + + /// Computes a quick hash based on files stat (without reading contents). This + /// is used to cache the real hash, which is slower to compute since it involves + /// reading every single file. + String _computeQuickHash(List files) { + final output = AccumulatorSink(); + final input = sha256.startChunkedConversion(output); + + final data = ByteData(8); + for (final file in files) { + input.add(utf8.encode(file.path)); + final stat = file.statSync(); + data.setUint64(0, stat.size); + input.add(data.buffer.asUint8List()); + data.setUint64(0, stat.modified.millisecondsSinceEpoch); + input.add(data.buffer.asUint8List()); + } + + input.close(); + return base64Url.encode(output.events.single.bytes); + } + + String _computeHash(List files) { + final output = AccumulatorSink(); + final input = sha256.startChunkedConversion(output); + + void addTextFile(File file) { + // text Files are hashed by lines in case we're dealing with github checkout + // that auto-converts line endings. + final splitter = LineSplitter(); + if (file.existsSync()) { + final data = file.readAsStringSync(); + final lines = splitter.convert(data); + for (final line in lines) { + input.add(utf8.encode(line)); + } + } + } + + for (final file in files) { + addTextFile(file); + } + + input.close(); + final res = output.events.single; + + // Truncate to 128bits. + final hash = res.bytes.sublist(0, 16); + return hex.encode(hash); + } + + List getFiles() { + final src = Directory(path.join(manifestDir, 'src')); + final files = src + .listSync(recursive: true, followLinks: false) + .whereType() + .toList(); + files.sortBy((element) => element.path); + void addFile(String relative) { + final file = File(path.join(manifestDir, relative)); + if (file.existsSync()) { + files.add(file); + } + } + + addFile('Cargo.toml'); + addFile('Cargo.lock'); + addFile('build.rs'); + addFile('cargokit.yaml'); + return files; + } + + final String manifestDir; + final String? tempStorage; +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/environment.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/environment.dart new file mode 100644 index 000000000..996483a18 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/environment.dart @@ -0,0 +1,68 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +extension on String { + String resolveSymlink() => File(this).resolveSymbolicLinksSync(); +} + +class Environment { + /// Current build configuration (debug or release). + static String get configuration => + _getEnv("CARGOKIT_CONFIGURATION").toLowerCase(); + + static bool get isDebug => configuration == 'debug'; + static bool get isRelease => configuration == 'release'; + + /// Temporary directory where Rust build artifacts are placed. + static String get targetTempDir => _getEnv("CARGOKIT_TARGET_TEMP_DIR"); + + /// Final output directory where the build artifacts are placed. + static String get outputDir => _getEnvPath('CARGOKIT_OUTPUT_DIR'); + + /// Path to the crate manifest (containing Cargo.toml). + static String get manifestDir => _getEnvPath('CARGOKIT_MANIFEST_DIR'); + + /// Directory inside root project. Not necessarily root folder. Symlinks are + /// not resolved on purpose. + static String get rootProjectDir => _getEnv('CARGOKIT_ROOT_PROJECT_DIR'); + + // Pod + + /// Platform name (macosx, iphoneos, iphonesimulator). + static String get darwinPlatformName => + _getEnv("CARGOKIT_DARWIN_PLATFORM_NAME"); + + /// List of architectures to build for (arm64, armv7, x86_64). + static List get darwinArchs => + _getEnv("CARGOKIT_DARWIN_ARCHS").split(' '); + + // Gradle + static String get minSdkVersion => _getEnv("CARGOKIT_MIN_SDK_VERSION"); + static String get ndkVersion => _getEnv("CARGOKIT_NDK_VERSION"); + static String get sdkPath => _getEnvPath("CARGOKIT_SDK_DIR"); + static String get javaHome => _getEnvPath("CARGOKIT_JAVA_HOME"); + static List get targetPlatforms => + _getEnv("CARGOKIT_TARGET_PLATFORMS").split(','); + + // CMAKE + static String get targetPlatform => _getEnv("CARGOKIT_TARGET_PLATFORM"); + + static String _getEnv(String key) { + final res = Platform.environment[key]; + if (res == null) { + throw Exception("Missing environment variable $key"); + } + return res; + } + + static String _getEnvPath(String key) { + final res = _getEnv(key); + if (Directory(res).existsSync()) { + return res.resolveSymlink(); + } else { + return res; + } + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/logging.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/logging.dart new file mode 100644 index 000000000..5edd4fd18 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/logging.dart @@ -0,0 +1,52 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:logging/logging.dart'; + +const String kSeparator = "--"; +const String kDoubleSeparator = "=="; + +bool _lastMessageWasSeparator = false; + +void _log(LogRecord rec) { + final prefix = '${rec.level.name}: '; + final out = rec.level == Level.SEVERE ? stderr : stdout; + if (rec.message == kSeparator) { + if (!_lastMessageWasSeparator) { + out.write(prefix); + out.writeln('-' * 80); + _lastMessageWasSeparator = true; + } + return; + } else if (rec.message == kDoubleSeparator) { + out.write(prefix); + out.writeln('=' * 80); + _lastMessageWasSeparator = true; + return; + } + out.write(prefix); + out.writeln(rec.message); + _lastMessageWasSeparator = false; +} + +void initLogging() { + Logger.root.level = Level.INFO; + Logger.root.onRecord.listen((LogRecord rec) { + final lines = rec.message.split('\n'); + for (final line in lines) { + if (line.isNotEmpty || lines.length == 1 || line != lines.last) { + _log(LogRecord( + rec.level, + line, + rec.loggerName, + )); + } + } + }); +} + +void enableVerboseLogging() { + Logger.root.level = Level.ALL; +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/options.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/options.dart new file mode 100644 index 000000000..22aef1d37 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/options.dart @@ -0,0 +1,309 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:collection/collection.dart'; +import 'package:ed25519_edwards/ed25519_edwards.dart'; +import 'package:hex/hex.dart'; +import 'package:logging/logging.dart'; +import 'package:path/path.dart' as path; +import 'package:source_span/source_span.dart'; +import 'package:yaml/yaml.dart'; + +import 'builder.dart'; +import 'environment.dart'; +import 'rustup.dart'; + +final _log = Logger('options'); + +/// A class for exceptions that have source span information attached. +class SourceSpanException implements Exception { + // This is a getter so that subclasses can override it. + /// A message describing the exception. + String get message => _message; + final String _message; + + // This is a getter so that subclasses can override it. + /// The span associated with this exception. + /// + /// This may be `null` if the source location can't be determined. + SourceSpan? get span => _span; + final SourceSpan? _span; + + SourceSpanException(this._message, this._span); + + /// Returns a string representation of `this`. + /// + /// [color] may either be a [String], a [bool], or `null`. If it's a string, + /// it indicates an ANSI terminal color escape that should be used to + /// highlight the span's text. If it's `true`, it indicates that the text + /// should be highlighted using the default color. If it's `false` or `null`, + /// it indicates that the text shouldn't be highlighted. + @override + String toString({Object? color}) { + if (span == null) return message; + return 'Error on ${span!.message(message, color: color)}'; + } +} + +enum Toolchain { + stable, + beta, + nightly, +} + +class CargoBuildOptions { + final Toolchain toolchain; + final List flags; + + CargoBuildOptions({ + required this.toolchain, + required this.flags, + }); + + static Toolchain _toolchainFromNode(YamlNode node) { + if (node case YamlScalar(value: String name)) { + final toolchain = + Toolchain.values.firstWhereOrNull((element) => element.name == name); + if (toolchain != null) { + return toolchain; + } + } + throw SourceSpanException( + 'Unknown toolchain. Must be one of ${Toolchain.values.map((e) => e.name)}.', + node.span); + } + + static CargoBuildOptions parse(YamlNode node) { + if (node is! YamlMap) { + throw SourceSpanException('Cargo options must be a map', node.span); + } + Toolchain toolchain = Toolchain.stable; + List flags = []; + for (final MapEntry(:key, :value) in node.nodes.entries) { + if (key case YamlScalar(value: 'toolchain')) { + toolchain = _toolchainFromNode(value); + } else if (key case YamlScalar(value: 'extra_flags')) { + if (value case YamlList(nodes: List list)) { + if (list.every((element) { + if (element case YamlScalar(value: String _)) { + return true; + } + return false; + })) { + flags = list.map((e) => e.value as String).toList(); + continue; + } + } + throw SourceSpanException( + 'Extra flags must be a list of strings', value.span); + } else { + throw SourceSpanException( + 'Unknown cargo option type. Must be "toolchain" or "extra_flags".', + key.span); + } + } + return CargoBuildOptions(toolchain: toolchain, flags: flags); + } +} + +extension on YamlMap { + /// Map that extracts keys so that we can do map case check on them. + Map get valueMap => + nodes.map((key, value) => MapEntry(key.value, value)); +} + +class PrecompiledBinaries { + final String uriPrefix; + final PublicKey publicKey; + + PrecompiledBinaries({ + required this.uriPrefix, + required this.publicKey, + }); + + static PublicKey _publicKeyFromHex(String key, SourceSpan? span) { + final bytes = HEX.decode(key); + if (bytes.length != 32) { + throw SourceSpanException( + 'Invalid public key. Must be 32 bytes long.', span); + } + return PublicKey(bytes); + } + + static PrecompiledBinaries parse(YamlNode node) { + if (node case YamlMap(valueMap: Map map)) { + if (map + case { + 'url_prefix': YamlNode urlPrefixNode, + 'public_key': YamlNode publicKeyNode, + }) { + final urlPrefix = switch (urlPrefixNode) { + YamlScalar(value: String urlPrefix) => urlPrefix, + _ => throw SourceSpanException( + 'Invalid URL prefix value.', urlPrefixNode.span), + }; + final publicKey = switch (publicKeyNode) { + YamlScalar(value: String publicKey) => + _publicKeyFromHex(publicKey, publicKeyNode.span), + _ => throw SourceSpanException( + 'Invalid public key value.', publicKeyNode.span), + }; + return PrecompiledBinaries( + uriPrefix: urlPrefix, + publicKey: publicKey, + ); + } + } + throw SourceSpanException( + 'Invalid precompiled binaries value. ' + 'Expected Map with "url_prefix" and "public_key".', + node.span); + } +} + +/// Cargokit options specified for Rust crate. +class CargokitCrateOptions { + CargokitCrateOptions({ + this.cargo = const {}, + this.precompiledBinaries, + }); + + final Map cargo; + final PrecompiledBinaries? precompiledBinaries; + + static CargokitCrateOptions parse(YamlNode node) { + if (node is! YamlMap) { + throw SourceSpanException('Cargokit options must be a map', node.span); + } + final options = {}; + PrecompiledBinaries? precompiledBinaries; + + for (final entry in node.nodes.entries) { + if (entry + case MapEntry( + key: YamlScalar(value: 'cargo'), + value: YamlNode node, + )) { + if (node is! YamlMap) { + throw SourceSpanException('Cargo options must be a map', node.span); + } + for (final MapEntry(:YamlNode key, :value) in node.nodes.entries) { + if (key case YamlScalar(value: String name)) { + final configuration = BuildConfiguration.values + .firstWhereOrNull((element) => element.name == name); + if (configuration != null) { + options[configuration] = CargoBuildOptions.parse(value); + continue; + } + } + throw SourceSpanException( + 'Unknown build configuration. Must be one of ${BuildConfiguration.values.map((e) => e.name)}.', + key.span); + } + } else if (entry.key case YamlScalar(value: 'precompiled_binaries')) { + precompiledBinaries = PrecompiledBinaries.parse(entry.value); + } else { + throw SourceSpanException( + 'Unknown cargokit option type. Must be "cargo" or "precompiled_binaries".', + entry.key.span); + } + } + return CargokitCrateOptions( + cargo: options, + precompiledBinaries: precompiledBinaries, + ); + } + + static CargokitCrateOptions load({ + required String manifestDir, + }) { + final uri = Uri.file(path.join(manifestDir, "cargokit.yaml")); + final file = File.fromUri(uri); + if (file.existsSync()) { + final contents = loadYamlNode(file.readAsStringSync(), sourceUrl: uri); + return parse(contents); + } else { + return CargokitCrateOptions(); + } + } +} + +class CargokitUserOptions { + // When Rustup is installed always build locally unless user opts into + // using precompiled binaries. + static bool defaultUsePrecompiledBinaries() { + return Rustup.executablePath() == null; + } + + CargokitUserOptions({ + required this.usePrecompiledBinaries, + required this.verboseLogging, + }); + + CargokitUserOptions._() + : usePrecompiledBinaries = defaultUsePrecompiledBinaries(), + verboseLogging = false; + + static CargokitUserOptions parse(YamlNode node) { + if (node is! YamlMap) { + throw SourceSpanException('Cargokit options must be a map', node.span); + } + bool usePrecompiledBinaries = defaultUsePrecompiledBinaries(); + bool verboseLogging = false; + + for (final entry in node.nodes.entries) { + if (entry.key case YamlScalar(value: 'use_precompiled_binaries')) { + if (entry.value case YamlScalar(value: bool value)) { + usePrecompiledBinaries = value; + continue; + } + throw SourceSpanException( + 'Invalid value for "use_precompiled_binaries". Must be a boolean.', + entry.value.span); + } else if (entry.key case YamlScalar(value: 'verbose_logging')) { + if (entry.value case YamlScalar(value: bool value)) { + verboseLogging = value; + continue; + } + throw SourceSpanException( + 'Invalid value for "verbose_logging". Must be a boolean.', + entry.value.span); + } else { + throw SourceSpanException( + 'Unknown cargokit option type. Must be "use_precompiled_binaries" or "verbose_logging".', + entry.key.span); + } + } + return CargokitUserOptions( + usePrecompiledBinaries: usePrecompiledBinaries, + verboseLogging: verboseLogging, + ); + } + + static CargokitUserOptions load() { + String fileName = "cargokit_options.yaml"; + var userProjectDir = Directory(Environment.rootProjectDir); + + while (userProjectDir.parent.path != userProjectDir.path) { + final configFile = File(path.join(userProjectDir.path, fileName)); + if (configFile.existsSync()) { + final contents = loadYamlNode( + configFile.readAsStringSync(), + sourceUrl: configFile.uri, + ); + final res = parse(contents); + if (res.verboseLogging) { + _log.info('Found user options file at ${configFile.path}'); + } + return res; + } + userProjectDir = userProjectDir.parent; + } + return CargokitUserOptions._(); + } + + final bool usePrecompiledBinaries; + final bool verboseLogging; +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart new file mode 100644 index 000000000..c27f4195d --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart @@ -0,0 +1,202 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:ed25519_edwards/ed25519_edwards.dart'; +import 'package:github/github.dart'; +import 'package:logging/logging.dart'; +import 'package:path/path.dart' as path; + +import 'artifacts_provider.dart'; +import 'builder.dart'; +import 'cargo.dart'; +import 'crate_hash.dart'; +import 'options.dart'; +import 'rustup.dart'; +import 'target.dart'; + +final _log = Logger('precompile_binaries'); + +class PrecompileBinaries { + PrecompileBinaries({ + required this.privateKey, + required this.githubToken, + required this.repositorySlug, + required this.manifestDir, + required this.targets, + this.androidSdkLocation, + this.androidNdkVersion, + this.androidMinSdkVersion, + this.tempDir, + }); + + final PrivateKey privateKey; + final String githubToken; + final RepositorySlug repositorySlug; + final String manifestDir; + final List targets; + final String? androidSdkLocation; + final String? androidNdkVersion; + final int? androidMinSdkVersion; + final String? tempDir; + + static String fileName(Target target, String name) { + return '${target.rust}_$name'; + } + + static String signatureFileName(Target target, String name) { + return '${target.rust}_$name.sig'; + } + + Future run() async { + final crateInfo = CrateInfo.load(manifestDir); + + final targets = List.of(this.targets); + if (targets.isEmpty) { + targets.addAll([ + ...Target.buildableTargets(), + if (androidSdkLocation != null) ...Target.androidTargets(), + ]); + } + + _log.info('Precompiling binaries for $targets'); + + final hash = CrateHash.compute(manifestDir); + _log.info('Computed crate hash: $hash'); + + final String tagName = 'precompiled_$hash'; + + final github = GitHub(auth: Authentication.withToken(githubToken)); + final repo = github.repositories; + final release = await _getOrCreateRelease( + repo: repo, + tagName: tagName, + packageName: crateInfo.packageName, + hash: hash, + ); + + final tempDir = this.tempDir != null + ? Directory(this.tempDir!) + : Directory.systemTemp.createTempSync('precompiled_'); + + tempDir.createSync(recursive: true); + + final crateOptions = CargokitCrateOptions.load( + manifestDir: manifestDir, + ); + + final buildEnvironment = BuildEnvironment( + configuration: BuildConfiguration.release, + crateOptions: crateOptions, + targetTempDir: tempDir.path, + manifestDir: manifestDir, + crateInfo: crateInfo, + isAndroid: androidSdkLocation != null, + androidSdkPath: androidSdkLocation, + androidNdkVersion: androidNdkVersion, + androidMinSdkVersion: androidMinSdkVersion, + ); + + final rustup = Rustup(); + + for (final target in targets) { + final artifactNames = getArtifactNames( + target: target, + libraryName: crateInfo.packageName, + remote: true, + ); + + if (artifactNames.every((name) { + final fileName = PrecompileBinaries.fileName(target, name); + return (release.assets ?? []).any((e) => e.name == fileName); + })) { + _log.info("All artifacts for $target already exist - skipping"); + continue; + } + + _log.info('Building for $target'); + + final builder = + RustBuilder(target: target, environment: buildEnvironment); + builder.prepare(rustup); + final res = await builder.build(); + + final assets = []; + for (final name in artifactNames) { + final file = File(path.join(res, name)); + if (!file.existsSync()) { + throw Exception('Missing artifact: ${file.path}'); + } + + final data = file.readAsBytesSync(); + final create = CreateReleaseAsset( + name: PrecompileBinaries.fileName(target, name), + contentType: "application/octet-stream", + assetData: data, + ); + final signature = sign(privateKey, data); + final signatureCreate = CreateReleaseAsset( + name: signatureFileName(target, name), + contentType: "application/octet-stream", + assetData: signature, + ); + bool verified = verify(public(privateKey), data, signature); + if (!verified) { + throw Exception('Signature verification failed'); + } + assets.add(create); + assets.add(signatureCreate); + } + _log.info('Uploading assets: ${assets.map((e) => e.name)}'); + for (final asset in assets) { + // This seems to be failing on CI so do it one by one + int retryCount = 0; + while (true) { + try { + await repo.uploadReleaseAssets(release, [asset]); + break; + } on Exception catch (e) { + if (retryCount == 10) { + rethrow; + } + ++retryCount; + _log.shout( + 'Upload failed (attempt $retryCount, will retry): ${e.toString()}'); + await Future.delayed(Duration(seconds: 2)); + } + } + } + } + + _log.info('Cleaning up'); + tempDir.deleteSync(recursive: true); + } + + Future _getOrCreateRelease({ + required RepositoriesService repo, + required String tagName, + required String packageName, + required String hash, + }) async { + Release release; + try { + _log.info('Fetching release $tagName'); + release = await repo.getReleaseByTagName(repositorySlug, tagName); + } on ReleaseNotFound { + _log.info('Release not found - creating release $tagName'); + release = await repo.createRelease( + repositorySlug, + CreateRelease.from( + tagName: tagName, + name: 'Precompiled binaries ${hash.substring(0, 8)}', + targetCommitish: null, + isDraft: false, + isPrerelease: false, + body: 'Precompiled binaries for crate $packageName, ' + 'crate hash $hash.', + )); + } + return release; + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/rustup.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/rustup.dart new file mode 100644 index 000000000..0ac8d0861 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/rustup.dart @@ -0,0 +1,136 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:collection/collection.dart'; +import 'package:path/path.dart' as path; + +import 'util.dart'; + +class _Toolchain { + _Toolchain( + this.name, + this.targets, + ); + + final String name; + final List targets; +} + +class Rustup { + List? installedTargets(String toolchain) { + final targets = _installedTargets(toolchain); + return targets != null ? List.unmodifiable(targets) : null; + } + + void installToolchain(String toolchain) { + log.info("Installing Rust toolchain: $toolchain"); + runCommand("rustup", ['toolchain', 'install', toolchain]); + _installedToolchains + .add(_Toolchain(toolchain, _getInstalledTargets(toolchain))); + } + + void installTarget( + String target, { + required String toolchain, + }) { + log.info("Installing Rust target: $target"); + runCommand("rustup", [ + 'target', + 'add', + '--toolchain', + toolchain, + target, + ]); + _installedTargets(toolchain)?.add(target); + } + + final List<_Toolchain> _installedToolchains; + + Rustup() : _installedToolchains = _getInstalledToolchains(); + + List? _installedTargets(String toolchain) => _installedToolchains + .firstWhereOrNull( + (e) => e.name == toolchain || e.name.startsWith('$toolchain-')) + ?.targets; + + static List<_Toolchain> _getInstalledToolchains() { + String extractToolchainName(String line) { + // ignore (default) after toolchain name + final parts = line.split(' '); + return parts[0]; + } + + final res = runCommand("rustup", ['toolchain', 'list']); + + // To list all non-custom toolchains, we need to filter out lines that + // don't start with "stable", "beta", or "nightly". + Pattern nonCustom = RegExp(r"^(stable|beta|nightly)"); + final lines = res.stdout + .toString() + .split('\n') + .where((e) => e.isNotEmpty && e.startsWith(nonCustom)) + .map(extractToolchainName) + .toList(growable: true); + + return lines + .map( + (name) => _Toolchain( + name, + _getInstalledTargets(name), + ), + ) + .toList(growable: true); + } + + static List _getInstalledTargets(String toolchain) { + final res = runCommand("rustup", [ + 'target', + 'list', + '--toolchain', + toolchain, + '--installed', + ]); + final lines = res.stdout + .toString() + .split('\n') + .where((e) => e.isNotEmpty) + .toList(growable: true); + return lines; + } + + bool _didInstallRustSrcForNightly = false; + + void installRustSrcForNightly() { + if (_didInstallRustSrcForNightly) { + return; + } + // Useful for -Z build-std + runCommand( + "rustup", + ['component', 'add', 'rust-src', '--toolchain', 'nightly'], + ); + _didInstallRustSrcForNightly = true; + } + + static String? executablePath() { + final envPath = Platform.environment['PATH']; + final envPathSeparator = Platform.isWindows ? ';' : ':'; + final home = Platform.isWindows + ? Platform.environment['USERPROFILE'] + : Platform.environment['HOME']; + final paths = [ + if (home != null) path.join(home, '.cargo', 'bin'), + if (envPath != null) ...envPath.split(envPathSeparator), + ]; + for (final p in paths) { + final rustup = Platform.isWindows ? 'rustup.exe' : 'rustup'; + final rustupPath = path.join(p, rustup); + if (File(rustupPath).existsSync()) { + return rustupPath; + } + } + return null; + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/target.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/target.dart new file mode 100644 index 000000000..6fbc58b64 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/target.dart @@ -0,0 +1,140 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:collection/collection.dart'; + +import 'util.dart'; + +class Target { + Target({ + required this.rust, + this.flutter, + this.android, + this.androidMinSdkVersion, + this.darwinPlatform, + this.darwinArch, + }); + + static final all = [ + Target( + rust: 'armv7-linux-androideabi', + flutter: 'android-arm', + android: 'armeabi-v7a', + androidMinSdkVersion: 16, + ), + Target( + rust: 'aarch64-linux-android', + flutter: 'android-arm64', + android: 'arm64-v8a', + androidMinSdkVersion: 21, + ), + Target( + rust: 'i686-linux-android', + flutter: 'android-x86', + android: 'x86', + androidMinSdkVersion: 16, + ), + Target( + rust: 'x86_64-linux-android', + flutter: 'android-x64', + android: 'x86_64', + androidMinSdkVersion: 21, + ), + Target( + rust: 'x86_64-pc-windows-msvc', + flutter: 'windows-x64', + ), + Target( + rust: 'x86_64-unknown-linux-gnu', + flutter: 'linux-x64', + ), + Target( + rust: 'aarch64-unknown-linux-gnu', + flutter: 'linux-arm64', + ), + Target( + rust: 'x86_64-apple-darwin', + darwinPlatform: 'macosx', + darwinArch: 'x86_64', + ), + Target( + rust: 'aarch64-apple-darwin', + darwinPlatform: 'macosx', + darwinArch: 'arm64', + ), + Target( + rust: 'aarch64-apple-ios', + darwinPlatform: 'iphoneos', + darwinArch: 'arm64', + ), + Target( + rust: 'aarch64-apple-ios-sim', + darwinPlatform: 'iphonesimulator', + darwinArch: 'arm64', + ), + Target( + rust: 'x86_64-apple-ios', + darwinPlatform: 'iphonesimulator', + darwinArch: 'x86_64', + ), + ]; + + static Target? forFlutterName(String flutterName) { + return all.firstWhereOrNull((element) => element.flutter == flutterName); + } + + static Target? forDarwin({ + required String platformName, + required String darwinAarch, + }) { + return all.firstWhereOrNull((element) => // + element.darwinPlatform == platformName && + element.darwinArch == darwinAarch); + } + + static Target? forRustTriple(String triple) { + return all.firstWhereOrNull((element) => element.rust == triple); + } + + static List androidTargets() { + return all + .where((element) => element.android != null) + .toList(growable: false); + } + + /// Returns buildable targets on current host platform ignoring Android targets. + static List buildableTargets() { + if (Platform.isLinux) { + // Right now we don't support cross-compiling on Linux. So we just return + // the host target. + final arch = runCommand('arch', []).stdout as String; + if (arch.trim() == 'aarch64') { + return [Target.forRustTriple('aarch64-unknown-linux-gnu')!]; + } else { + return [Target.forRustTriple('x86_64-unknown-linux-gnu')!]; + } + } + return all.where((target) { + if (Platform.isWindows) { + return target.rust.contains('-windows-'); + } else if (Platform.isMacOS) { + return target.darwinPlatform != null; + } + return false; + }).toList(growable: false); + } + + @override + String toString() { + return rust; + } + + final String? flutter; + final String rust; + final String? android; + final int? androidMinSdkVersion; + final String? darwinPlatform; + final String? darwinArch; +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/util.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/util.dart new file mode 100644 index 000000000..8bb6a8724 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/util.dart @@ -0,0 +1,172 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:convert'; +import 'dart:io'; + +import 'package:logging/logging.dart'; +import 'package:path/path.dart' as path; + +import 'logging.dart'; +import 'rustup.dart'; + +final log = Logger("process"); + +class CommandFailedException implements Exception { + final String executable; + final List arguments; + final ProcessResult result; + + CommandFailedException({ + required this.executable, + required this.arguments, + required this.result, + }); + + @override + String toString() { + final stdout = result.stdout.toString().trim(); + final stderr = result.stderr.toString().trim(); + return [ + "External Command: $executable ${arguments.map((e) => '"$e"').join(' ')}", + "Returned Exit Code: ${result.exitCode}", + kSeparator, + "STDOUT:", + if (stdout.isNotEmpty) stdout, + kSeparator, + "STDERR:", + if (stderr.isNotEmpty) stderr, + ].join('\n'); + } +} + +class TestRunCommandArgs { + final String executable; + final List arguments; + final String? workingDirectory; + final Map? environment; + final bool includeParentEnvironment; + final bool runInShell; + final Encoding? stdoutEncoding; + final Encoding? stderrEncoding; + + TestRunCommandArgs({ + required this.executable, + required this.arguments, + this.workingDirectory, + this.environment, + this.includeParentEnvironment = true, + this.runInShell = false, + this.stdoutEncoding, + this.stderrEncoding, + }); +} + +class TestRunCommandResult { + TestRunCommandResult({ + this.pid = 1, + this.exitCode = 0, + this.stdout = '', + this.stderr = '', + }); + + final int pid; + final int exitCode; + final String stdout; + final String stderr; +} + +TestRunCommandResult Function(TestRunCommandArgs args)? testRunCommandOverride; + +ProcessResult runCommand( + String executable, + List arguments, { + String? workingDirectory, + Map? environment, + bool includeParentEnvironment = true, + bool runInShell = false, + Encoding? stdoutEncoding = systemEncoding, + Encoding? stderrEncoding = systemEncoding, +}) { + if (testRunCommandOverride != null) { + final result = testRunCommandOverride!(TestRunCommandArgs( + executable: executable, + arguments: arguments, + workingDirectory: workingDirectory, + environment: environment, + includeParentEnvironment: includeParentEnvironment, + runInShell: runInShell, + stdoutEncoding: stdoutEncoding, + stderrEncoding: stderrEncoding, + )); + return ProcessResult( + result.pid, + result.exitCode, + result.stdout, + result.stderr, + ); + } + log.finer('Running command $executable ${arguments.join(' ')}'); + final res = Process.runSync( + _resolveExecutable(executable), + arguments, + workingDirectory: workingDirectory, + environment: environment, + includeParentEnvironment: includeParentEnvironment, + runInShell: runInShell, + stderrEncoding: stderrEncoding, + stdoutEncoding: stdoutEncoding, + ); + if (res.exitCode != 0) { + throw CommandFailedException( + executable: executable, + arguments: arguments, + result: res, + ); + } else { + return res; + } +} + +class RustupNotFoundException implements Exception { + @override + String toString() { + return [ + ' ', + 'rustup not found in PATH.', + ' ', + 'Maybe you need to install Rust? It only takes a minute:', + ' ', + if (Platform.isWindows) 'https://www.rust-lang.org/tools/install', + if (hasHomebrewRustInPath()) ...[ + '\$ brew unlink rust # Unlink homebrew Rust from PATH', + ], + if (!Platform.isWindows) + "\$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh", + ' ', + ].join('\n'); + } + + static bool hasHomebrewRustInPath() { + if (!Platform.isMacOS) { + return false; + } + final envPath = Platform.environment['PATH'] ?? ''; + final paths = envPath.split(':'); + return paths.any((p) { + return p.contains('homebrew') && File(path.join(p, 'rustc')).existsSync(); + }); + } +} + +String _resolveExecutable(String executable) { + if (executable == 'rustup') { + final resolved = Rustup.executablePath(); + if (resolved != null) { + return resolved; + } + throw RustupNotFoundException(); + } else { + return executable; + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart new file mode 100644 index 000000000..2366b57bf --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart @@ -0,0 +1,84 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import 'dart:io'; + +import 'package:ed25519_edwards/ed25519_edwards.dart'; +import 'package:http/http.dart'; + +import 'artifacts_provider.dart'; +import 'cargo.dart'; +import 'crate_hash.dart'; +import 'options.dart'; +import 'precompile_binaries.dart'; +import 'target.dart'; + +class VerifyBinaries { + VerifyBinaries({ + required this.manifestDir, + }); + + final String manifestDir; + + Future run() async { + final crateInfo = CrateInfo.load(manifestDir); + + final config = CargokitCrateOptions.load(manifestDir: manifestDir); + final precompiledBinaries = config.precompiledBinaries; + if (precompiledBinaries == null) { + stdout.writeln('Crate does not support precompiled binaries.'); + } else { + final crateHash = CrateHash.compute(manifestDir); + stdout.writeln('Crate hash: $crateHash'); + + for (final target in Target.all) { + final message = 'Checking ${target.rust}...'; + stdout.write(message.padRight(40)); + stdout.flush(); + + final artifacts = getArtifactNames( + target: target, + libraryName: crateInfo.packageName, + remote: true, + ); + + final prefix = precompiledBinaries.uriPrefix; + + bool ok = true; + + for (final artifact in artifacts) { + final fileName = PrecompileBinaries.fileName(target, artifact); + final signatureFileName = + PrecompileBinaries.signatureFileName(target, artifact); + + final url = Uri.parse('$prefix$crateHash/$fileName'); + final signatureUrl = + Uri.parse('$prefix$crateHash/$signatureFileName'); + + final signature = await get(signatureUrl); + if (signature.statusCode != 200) { + stdout.writeln('MISSING'); + ok = false; + break; + } + final asset = await get(url); + if (asset.statusCode != 200) { + stdout.writeln('MISSING'); + ok = false; + break; + } + + if (!verify(precompiledBinaries.publicKey, asset.bodyBytes, + signature.bodyBytes)) { + stdout.writeln('INVALID SIGNATURE'); + ok = false; + } + } + + if (ok) { + stdout.writeln('OK'); + } + } + } + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.lock b/examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.lock new file mode 100644 index 000000000..343bdd369 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.lock @@ -0,0 +1,453 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 + url: "https://pub.dev" + source: hosted + version: "64.0.0" + adaptive_number: + dependency: transitive + description: + name: adaptive_number + sha256: "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" + url: "https://pub.dev" + source: hosted + version: "6.2.0" + args: + dependency: "direct main" + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + collection: + dependency: "direct main" + description: + name: collection + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" + source: hosted + version: "1.18.0" + convert: + dependency: "direct main" + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + coverage: + dependency: transitive + description: + name: coverage + sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097" + url: "https://pub.dev" + source: hosted + version: "1.6.3" + crypto: + dependency: "direct main" + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" + ed25519_edwards: + dependency: "direct main" + description: + name: ed25519_edwards + sha256: "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + file: + dependency: transitive + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + github: + dependency: "direct main" + description: + name: github + sha256: "9966bc13bf612342e916b0a343e95e5f046c88f602a14476440e9b75d2295411" + url: "https://pub.dev" + source: hosted + version: "9.17.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + hex: + dependency: "direct main" + description: + name: hex + sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a" + url: "https://pub.dev" + source: hosted + version: "0.2.0" + http: + dependency: "direct main" + description: + name: http + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" + lints: + dependency: "direct dev" + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + logging: + dependency: "direct main" + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + meta: + dependency: transitive + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + mime: + dependency: transitive + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" + node_preamble: + dependency: transitive + description: + name: node_preamble + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: "direct main" + description: + name: path + sha256: "2ad4cddff7f5cc0e2d13069f2a3f7a73ca18f66abd6f5ecf215219cdb3638edb" + url: "https://pub.dev" + source: hosted + version: "1.8.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + shelf_static: + dependency: transitive + description: + name: shelf_static + sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + url: "https://pub.dev" + source: hosted + version: "1.1.2" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + source_maps: + dependency: transitive + description: + name: source_maps + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" + source: hosted + version: "0.10.12" + source_span: + dependency: "direct main" + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" + source: hosted + version: "1.11.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" + source: hosted + version: "2.1.2" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test: + dependency: "direct dev" + description: + name: test + sha256: "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9" + url: "https://pub.dev" + source: hosted + version: "1.24.6" + test_api: + dependency: transitive + description: + name: test_api + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" + source: hosted + version: "0.6.1" + test_core: + dependency: transitive + description: + name: test_core + sha256: "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265" + url: "https://pub.dev" + source: hosted + version: "0.5.6" + toml: + dependency: "direct main" + description: + name: toml + sha256: "157c5dca5160fced243f3ce984117f729c788bb5e475504f3dbcda881accee44" + url: "https://pub.dev" + source: hosted + version: "0.14.0" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + version: + dependency: "direct main" + description: + name: version + sha256: "2307e23a45b43f96469eeab946208ed63293e8afca9c28cd8b5241ff31c55f55" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "0fae432c85c4ea880b33b497d32824b97795b04cdaa74d270219572a1f50268d" + url: "https://pub.dev" + source: hosted + version: "11.9.0" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" + source: hosted + version: "2.4.0" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + yaml: + dependency: "direct main" + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" +sdks: + dart: ">=3.0.0 <4.0.0" diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.yaml b/examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.yaml new file mode 100644 index 000000000..18c61e338 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/pubspec.yaml @@ -0,0 +1,33 @@ +# This is copied from Cargokit (which is the official way to use it currently) +# Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +name: build_tool +description: Cargokit build_tool. Facilitates the build of Rust crate during Flutter application build. +publish_to: none +version: 1.0.0 + +environment: + sdk: ">=3.0.0 <4.0.0" + +# Add regular dependencies here. +dependencies: + # these are pinned on purpose because the bundle_tool_runner doesn't have + # pubspec.lock. See run_build_tool.sh + logging: 1.2.0 + path: 1.8.0 + version: 3.0.0 + collection: 1.18.0 + ed25519_edwards: 0.3.1 + hex: 0.2.0 + yaml: 3.1.2 + source_span: 1.10.0 + github: 9.17.0 + args: 2.4.2 + crypto: 3.0.3 + convert: 3.1.1 + http: 1.1.0 + toml: 0.14.0 + +dev_dependencies: + lints: ^2.1.0 + test: ^1.24.0 diff --git a/examples/flutter/example/rust_builder/cargokit/cmake/cargokit.cmake b/examples/flutter/example/rust_builder/cargokit/cmake/cargokit.cmake new file mode 100644 index 000000000..ddd05df9b --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/cmake/cargokit.cmake @@ -0,0 +1,99 @@ +SET(cargokit_cmake_root "${CMAKE_CURRENT_LIST_DIR}/..") + +# Workaround for https://github.com/dart-lang/pub/issues/4010 +get_filename_component(cargokit_cmake_root "${cargokit_cmake_root}" REALPATH) + +if(WIN32) + # REALPATH does not properly resolve symlinks on windows :-/ + execute_process(COMMAND powershell -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_LIST_DIR}/resolve_symlinks.ps1" "${cargokit_cmake_root}" OUTPUT_VARIABLE cargokit_cmake_root OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() + +# Arguments +# - target: CMAKE target to which rust library is linked +# - manifest_dir: relative path from current folder to directory containing cargo manifest +# - lib_name: cargo package name +# - any_symbol_name: name of any exported symbol from the library. +# used on windows to force linking with library. +function(apply_cargokit target manifest_dir lib_name any_symbol_name) + + set(CARGOKIT_LIB_NAME "${lib_name}") + set(CARGOKIT_LIB_FULL_NAME "${CMAKE_SHARED_MODULE_PREFIX}${CARGOKIT_LIB_NAME}${CMAKE_SHARED_MODULE_SUFFIX}") + if (CMAKE_CONFIGURATION_TYPES) + set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$") + set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/$/${CARGOKIT_LIB_FULL_NAME}") + else() + set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") + set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/${CARGOKIT_LIB_FULL_NAME}") + endif() + set(CARGOKIT_TEMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/cargokit_build") + + if (FLUTTER_TARGET_PLATFORM) + set(CARGOKIT_TARGET_PLATFORM "${FLUTTER_TARGET_PLATFORM}") + else() + set(CARGOKIT_TARGET_PLATFORM "windows-x64") + endif() + + set(CARGOKIT_ENV + "CARGOKIT_CMAKE=${CMAKE_COMMAND}" + "CARGOKIT_CONFIGURATION=$" + "CARGOKIT_MANIFEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${manifest_dir}" + "CARGOKIT_TARGET_TEMP_DIR=${CARGOKIT_TEMP_DIR}" + "CARGOKIT_OUTPUT_DIR=${CARGOKIT_OUTPUT_DIR}" + "CARGOKIT_TARGET_PLATFORM=${CARGOKIT_TARGET_PLATFORM}" + "CARGOKIT_TOOL_TEMP_DIR=${CARGOKIT_TEMP_DIR}/tool" + "CARGOKIT_ROOT_PROJECT_DIR=${CMAKE_SOURCE_DIR}" + ) + + if (WIN32) + set(SCRIPT_EXTENSION ".cmd") + set(IMPORT_LIB_EXTENSION ".lib") + else() + set(SCRIPT_EXTENSION ".sh") + set(IMPORT_LIB_EXTENSION "") + execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}") + endif() + + # Using generators in custom command is only supported in CMake 3.20+ + if (CMAKE_CONFIGURATION_TYPES AND ${CMAKE_VERSION} VERSION_LESS "3.20.0") + foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) + add_custom_command( + OUTPUT + "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}" + "${CMAKE_CURRENT_BINARY_DIR}/_phony_" + COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} + "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake + VERBATIM + ) + endforeach() + else() + add_custom_command( + OUTPUT + ${OUTPUT_LIB} + "${CMAKE_CURRENT_BINARY_DIR}/_phony_" + COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} + "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake + VERBATIM + ) + endif() + + + set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE) + + if (TARGET ${target}) + # If we have actual cmake target provided create target and make existing + # target depend on it + add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB}) + add_dependencies("${target}" "${target}_cargokit") + target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}") + if(WIN32) + target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}") + endif() + else() + # Otherwise (FFI) just use ALL to force building always + add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB}) + endif() + + # Allow adding the output library to plugin bundled libraries + set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE) + +endfunction() diff --git a/examples/flutter/example/rust_builder/cargokit/cmake/resolve_symlinks.ps1 b/examples/flutter/example/rust_builder/cargokit/cmake/resolve_symlinks.ps1 new file mode 100644 index 000000000..3d10d283c --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/cmake/resolve_symlinks.ps1 @@ -0,0 +1,27 @@ +function Resolve-Symlinks { + [CmdletBinding()] + [OutputType([string])] + param( + [Parameter(Position = 0, Mandatory, ValueFromPipeline, ValueFromPipelineByPropertyName)] + [string] $Path + ) + + [string] $separator = '/' + [string[]] $parts = $Path.Split($separator) + + [string] $realPath = '' + foreach ($part in $parts) { + if ($realPath -and !$realPath.EndsWith($separator)) { + $realPath += $separator + } + $realPath += $part + $item = Get-Item $realPath + if ($item.Target) { + $realPath = $item.Target.Replace('\', '/') + } + } + $realPath +} + +$path=Resolve-Symlinks -Path $args[0] +Write-Host $path diff --git a/examples/flutter/example/rust_builder/cargokit/gradle/plugin.gradle b/examples/flutter/example/rust_builder/cargokit/gradle/plugin.gradle new file mode 100644 index 000000000..1aead8913 --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/gradle/plugin.gradle @@ -0,0 +1,179 @@ +/// This is copied from Cargokit (which is the official way to use it currently) +/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin + +import java.nio.file.Paths +import org.apache.tools.ant.taskdefs.condition.Os + +CargoKitPlugin.file = buildscript.sourceFile + +apply plugin: CargoKitPlugin + +class CargoKitExtension { + String manifestDir; // Relative path to folder containing Cargo.toml + String libname; // Library name within Cargo.toml. Must be a cdylib +} + +abstract class CargoKitBuildTask extends DefaultTask { + + @Input + String buildMode + + @Input + String buildDir + + @Input + String outputDir + + @Input + String ndkVersion + + @Input + String sdkDirectory + + @Input + int compileSdkVersion; + + @Input + int minSdkVersion; + + @Input + String pluginFile + + @Input + List targetPlatforms + + @TaskAction + def build() { + if (project.cargokit.manifestDir == null) { + throw new GradleException("Property 'manifestDir' must be set on cargokit extension"); + } + + if (project.cargokit.libname == null) { + throw new GradleException("Property 'libname' must be set on cargokit extension"); + } + + def executableName = Os.isFamily(Os.FAMILY_WINDOWS) ? "run_build_tool.cmd" : "run_build_tool.sh" + def path = Paths.get(new File(pluginFile).parent, "..", executableName); + + def manifestDir = Paths.get(project.buildscript.sourceFile.parent, project.cargokit.manifestDir) + + def rootProjectDir = project.rootProject.projectDir + + if (!Os.isFamily(Os.FAMILY_WINDOWS)) { + project.exec { + commandLine 'chmod', '+x', path + } + } + + project.exec { + executable path + args "build-gradle" + environment "CARGOKIT_ROOT_PROJECT_DIR", rootProjectDir + environment "CARGOKIT_TOOL_TEMP_DIR", "${buildDir}/build_tool" + environment "CARGOKIT_MANIFEST_DIR", manifestDir + environment "CARGOKIT_CONFIGURATION", buildMode + environment "CARGOKIT_TARGET_TEMP_DIR", buildDir + environment "CARGOKIT_OUTPUT_DIR", outputDir + environment "CARGOKIT_NDK_VERSION", ndkVersion + environment "CARGOKIT_SDK_DIR", sdkDirectory + environment "CARGOKIT_COMPILE_SDK_VERSION", compileSdkVersion + environment "CARGOKIT_MIN_SDK_VERSION", minSdkVersion + environment "CARGOKIT_TARGET_PLATFORMS", targetPlatforms.join(",") + environment "CARGOKIT_JAVA_HOME", System.properties['java.home'] + } + } +} + +class CargoKitPlugin implements Plugin { + + static String file; + + private Plugin findFlutterPlugin(Project rootProject) { + _findFlutterPlugin(rootProject.childProjects) + } + + private Plugin _findFlutterPlugin(Map projects) { + for (project in projects) { + for (plugin in project.value.getPlugins()) { + if (plugin.class.name == "FlutterPlugin") { + return plugin; + } + } + def plugin = _findFlutterPlugin(project.value.childProjects); + if (plugin != null) { + return plugin; + } + } + return null; + } + + @Override + void apply(Project project) { + def plugin = findFlutterPlugin(project.rootProject); + + project.extensions.create("cargokit", CargoKitExtension) + + if (plugin == null) { + print("Flutter plugin not found, CargoKit plugin will not be applied.") + return; + } + + def cargoBuildDir = "${project.buildDir}/build" + + // Determine if the project is an application or library + def isApplication = plugin.project.plugins.hasPlugin('com.android.application') + def variants = isApplication ? plugin.project.android.applicationVariants : plugin.project.android.libraryVariants + + variants.all { variant -> + + final buildType = variant.buildType.name + + def cargoOutputDir = "${project.buildDir}/jniLibs/${buildType}"; + def jniLibs = project.android.sourceSets.maybeCreate(buildType).jniLibs; + jniLibs.srcDir(new File(cargoOutputDir)) + + def platforms = plugin.getTargetPlatforms().collect() + + // Same thing addFlutterDependencies does in flutter.gradle + if (buildType == "debug") { + platforms.add("android-x86") + platforms.add("android-x64") + } + + // The task name depends on plugin properties, which are not available + // at this point + project.getGradle().afterProject { + def taskName = "cargokitCargoBuild${project.cargokit.libname.capitalize()}${buildType.capitalize()}"; + + if (project.tasks.findByName(taskName)) { + return + } + + if (plugin.project.android.ndkVersion == null) { + throw new GradleException("Please set 'android.ndkVersion' in 'app/build.gradle'.") + } + + def task = project.tasks.create(taskName, CargoKitBuildTask.class) { + buildMode = variant.buildType.name + buildDir = cargoBuildDir + outputDir = cargoOutputDir + ndkVersion = plugin.project.android.ndkVersion + sdkDirectory = plugin.project.android.sdkDirectory + minSdkVersion = plugin.project.android.defaultConfig.minSdkVersion.apiLevel as int + compileSdkVersion = plugin.project.android.compileSdkVersion.substring(8) as int + targetPlatforms = platforms + pluginFile = CargoKitPlugin.file + } + def onTask = { newTask -> + if (newTask.name == "merge${buildType.capitalize()}NativeLibs") { + newTask.dependsOn task + // Fix gradle 7.4.2 not picking up JNI library changes + newTask.outputs.upToDateWhen { false } + } + } + project.tasks.each onTask + project.tasks.whenTaskAdded onTask + } + } + } +} diff --git a/examples/flutter/example/rust_builder/cargokit/run_build_tool.cmd b/examples/flutter/example/rust_builder/cargokit/run_build_tool.cmd new file mode 100755 index 000000000..c45d0aa8b --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/run_build_tool.cmd @@ -0,0 +1,91 @@ +@echo off +setlocal + +setlocal ENABLEDELAYEDEXPANSION + +SET BASEDIR=%~dp0 + +if not exist "%CARGOKIT_TOOL_TEMP_DIR%" ( + mkdir "%CARGOKIT_TOOL_TEMP_DIR%" +) +cd /D "%CARGOKIT_TOOL_TEMP_DIR%" + +SET BUILD_TOOL_PKG_DIR=%BASEDIR%build_tool +SET DART=%FLUTTER_ROOT%\bin\cache\dart-sdk\bin\dart + +set BUILD_TOOL_PKG_DIR_POSIX=%BUILD_TOOL_PKG_DIR:\=/% + +( + echo name: build_tool_runner + echo version: 1.0.0 + echo publish_to: none + echo. + echo environment: + echo sdk: '^>=3.0.0 ^<4.0.0' + echo. + echo dependencies: + echo build_tool: + echo path: %BUILD_TOOL_PKG_DIR_POSIX% +) >pubspec.yaml + +if not exist bin ( + mkdir bin +) + +( + echo import 'package:build_tool/build_tool.dart' as build_tool; + echo void main^(List^ args^) ^{ + echo build_tool.runMain^(args^); + echo ^} +) >bin\build_tool_runner.dart + +SET PRECOMPILED=bin\build_tool_runner.dill + +REM To detect changes in package we compare output of DIR /s (recursive) +set PREV_PACKAGE_INFO=.dart_tool\package_info.prev +set CUR_PACKAGE_INFO=.dart_tool\package_info.cur + +DIR "%BUILD_TOOL_PKG_DIR%" /s > "%CUR_PACKAGE_INFO%_orig" + +REM Last line in dir output is free space on harddrive. That is bound to +REM change between invocation so we need to remove it +( + Set "Line=" + For /F "UseBackQ Delims=" %%A In ("%CUR_PACKAGE_INFO%_orig") Do ( + SetLocal EnableDelayedExpansion + If Defined Line Echo !Line! + EndLocal + Set "Line=%%A") +) >"%CUR_PACKAGE_INFO%" +DEL "%CUR_PACKAGE_INFO%_orig" + +REM Compare current directory listing with previous +FC /B "%CUR_PACKAGE_INFO%" "%PREV_PACKAGE_INFO%" > nul 2>&1 + +If %ERRORLEVEL% neq 0 ( + REM Changed - copy current to previous and remove precompiled kernel + if exist "%PREV_PACKAGE_INFO%" ( + DEL "%PREV_PACKAGE_INFO%" + ) + MOVE /Y "%CUR_PACKAGE_INFO%" "%PREV_PACKAGE_INFO%" + if exist "%PRECOMPILED%" ( + DEL "%PRECOMPILED%" + ) +) + +REM There is no CUR_PACKAGE_INFO it was renamed in previous step to %PREV_PACKAGE_INFO% +REM which means we need to do pub get and precompile +if not exist "%PRECOMPILED%" ( + echo Running pub get in "%cd%" + "%DART%" pub get --no-precompile + "%DART%" compile kernel bin/build_tool_runner.dart +) + +"%DART%" "%PRECOMPILED%" %* + +REM 253 means invalid snapshot version. +If %ERRORLEVEL% equ 253 ( + "%DART%" pub get --no-precompile + "%DART%" compile kernel bin/build_tool_runner.dart + "%DART%" "%PRECOMPILED%" %* +) diff --git a/examples/flutter/example/rust_builder/cargokit/run_build_tool.sh b/examples/flutter/example/rust_builder/cargokit/run_build_tool.sh new file mode 100755 index 000000000..6e594a23d --- /dev/null +++ b/examples/flutter/example/rust_builder/cargokit/run_build_tool.sh @@ -0,0 +1,94 @@ +#!/usr/bin/env bash + +set -e + +BASEDIR=$(dirname "$0") + +mkdir -p "$CARGOKIT_TOOL_TEMP_DIR" + +cd "$CARGOKIT_TOOL_TEMP_DIR" + +# Write a very simple bin package in temp folder that depends on build_tool package +# from Cargokit. This is done to ensure that we don't pollute Cargokit folder +# with .dart_tool contents. + +BUILD_TOOL_PKG_DIR="$BASEDIR/build_tool" + +if [[ -z $FLUTTER_ROOT ]]; then # not defined + DART=dart +else + DART="$FLUTTER_ROOT/bin/cache/dart-sdk/bin/dart" +fi + +cat << EOF > "pubspec.yaml" +name: build_tool_runner +version: 1.0.0 +publish_to: none + +environment: + sdk: '>=3.0.0 <4.0.0' + +dependencies: + build_tool: + path: "$BUILD_TOOL_PKG_DIR" +EOF + +mkdir -p "bin" + +cat << EOF > "bin/build_tool_runner.dart" +import 'package:build_tool/build_tool.dart' as build_tool; +void main(List args) { + build_tool.runMain(args); +} +EOF + +# Create alias for `shasum` if it does not exist and `sha1sum` exists +if ! [ -x "$(command -v shasum)" ] && [ -x "$(command -v sha1sum)" ]; then + shopt -s expand_aliases + alias shasum="sha1sum" +fi + +# Dart run will not cache any package that has a path dependency, which +# is the case for our build_tool_runner. So instead we precompile the package +# ourselves. +# To invalidate the cached kernel we use the hash of ls -LR of the build_tool +# package directory. This should be good enough, as the build_tool package +# itself is not meant to have any path dependencies. + +if [[ "$OSTYPE" == "darwin"* ]]; then + PACKAGE_HASH=$(ls -lTR "$BUILD_TOOL_PKG_DIR" | shasum) +else + PACKAGE_HASH=$(ls -lR --full-time "$BUILD_TOOL_PKG_DIR" | shasum) +fi + +PACKAGE_HASH_FILE=".package_hash" + +if [ -f "$PACKAGE_HASH_FILE" ]; then + EXISTING_HASH=$(cat "$PACKAGE_HASH_FILE") + if [ "$PACKAGE_HASH" != "$EXISTING_HASH" ]; then + rm "$PACKAGE_HASH_FILE" + fi +fi + +# Run pub get if needed. +if [ ! -f "$PACKAGE_HASH_FILE" ]; then + "$DART" pub get --no-precompile + "$DART" compile kernel bin/build_tool_runner.dart + echo "$PACKAGE_HASH" > "$PACKAGE_HASH_FILE" +fi + +set +e + +"$DART" bin/build_tool_runner.dill "$@" + +exit_code=$? + +# 253 means invalid snapshot version. +if [ $exit_code == 253 ]; then + "$DART" pub get --no-precompile + "$DART" compile kernel bin/build_tool_runner.dart + "$DART" bin/build_tool_runner.dill "$@" + exit_code=$? +fi + +exit $exit_code diff --git a/examples/flutter/example/rust_builder/ios/Classes/dummy_file.c b/examples/flutter/example/rust_builder/ios/Classes/dummy_file.c new file mode 100644 index 000000000..e06dab996 --- /dev/null +++ b/examples/flutter/example/rust_builder/ios/Classes/dummy_file.c @@ -0,0 +1 @@ +// This is an empty file to force CocoaPods to create a framework. diff --git a/examples/flutter/example/rust_builder/ios/rust_lib_example.podspec b/examples/flutter/example/rust_builder/ios/rust_lib_example.podspec new file mode 100644 index 000000000..21a283801 --- /dev/null +++ b/examples/flutter/example/rust_builder/ios/rust_lib_example.podspec @@ -0,0 +1,45 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. +# Run `pod lib lint rust_lib_example.podspec` to validate before publishing. +# +Pod::Spec.new do |s| + s.name = 'rust_lib_example' + s.version = '0.0.1' + s.summary = 'A new Flutter FFI plugin project.' + s.description = <<-DESC +A new Flutter FFI plugin project. + DESC + s.homepage = 'http://example.com' + s.license = { :file => '../LICENSE' } + s.author = { 'Your Company' => 'email@example.com' } + + # This will ensure the source files in Classes/ are included in the native + # builds of apps using this FFI plugin. Podspec does not support relative + # paths, so Classes contains a forwarder C file that relatively imports + # `../src/*` so that the C sources can be shared among all target platforms. + s.source = { :path => '.' } + s.source_files = 'Classes/**/*' + s.dependency 'Flutter' + s.platform = :ios, '11.0' + + # Flutter.framework does not contain a i386 slice. + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } + s.swift_version = '5.0' + + s.script_phase = { + :name => 'Build Rust library', + # First argument is relative path to the `rust` folder, second is name of rust library + :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_example', + :execution_position => :before_compile, + :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'], + # Let XCode know that the static library referenced in -force_load below is + # created by this build step. + :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_example.a"], + } + s.pod_target_xcconfig = { + 'DEFINES_MODULE' => 'YES', + # Flutter.framework does not contain a i386 slice. + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386', + 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_example.a', + } +end \ No newline at end of file diff --git a/examples/flutter/example/rust_builder/linux/CMakeLists.txt b/examples/flutter/example/rust_builder/linux/CMakeLists.txt new file mode 100644 index 000000000..58825c89b --- /dev/null +++ b/examples/flutter/example/rust_builder/linux/CMakeLists.txt @@ -0,0 +1,19 @@ +# The Flutter tooling requires that developers have CMake 3.10 or later +# installed. You should not increase this version, as doing so will cause +# the plugin to fail to compile for some customers of the plugin. +cmake_minimum_required(VERSION 3.10) + +# Project-level configuration. +set(PROJECT_NAME "rust_lib_example") +project(${PROJECT_NAME} LANGUAGES CXX) + +include("../cargokit/cmake/cargokit.cmake") +apply_cargokit(${PROJECT_NAME} ../../rust rust_lib_example "") + +# List of absolute paths to libraries that should be bundled with the plugin. +# This list could contain prebuilt libraries, or libraries created by an +# external build triggered from this build file. +set(rust_lib_example_bundled_libraries + "${${PROJECT_NAME}_cargokit_lib}" + PARENT_SCOPE +) diff --git a/examples/flutter/example/rust_builder/macos/Classes/dummy_file.c b/examples/flutter/example/rust_builder/macos/Classes/dummy_file.c new file mode 100644 index 000000000..e06dab996 --- /dev/null +++ b/examples/flutter/example/rust_builder/macos/Classes/dummy_file.c @@ -0,0 +1 @@ +// This is an empty file to force CocoaPods to create a framework. diff --git a/examples/flutter/example/rust_builder/macos/rust_lib_example.podspec b/examples/flutter/example/rust_builder/macos/rust_lib_example.podspec new file mode 100644 index 000000000..4530f9667 --- /dev/null +++ b/examples/flutter/example/rust_builder/macos/rust_lib_example.podspec @@ -0,0 +1,44 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. +# Run `pod lib lint rust_lib_example.podspec` to validate before publishing. +# +Pod::Spec.new do |s| + s.name = 'rust_lib_example' + s.version = '0.0.1' + s.summary = 'A new Flutter FFI plugin project.' + s.description = <<-DESC +A new Flutter FFI plugin project. + DESC + s.homepage = 'http://example.com' + s.license = { :file => '../LICENSE' } + s.author = { 'Your Company' => 'email@example.com' } + + # This will ensure the source files in Classes/ are included in the native + # builds of apps using this FFI plugin. Podspec does not support relative + # paths, so Classes contains a forwarder C file that relatively imports + # `../src/*` so that the C sources can be shared among all target platforms. + s.source = { :path => '.' } + s.source_files = 'Classes/**/*' + s.dependency 'FlutterMacOS' + + s.platform = :osx, '10.11' + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } + s.swift_version = '5.0' + + s.script_phase = { + :name => 'Build Rust library', + # First argument is relative path to the `rust` folder, second is name of rust library + :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_example', + :execution_position => :before_compile, + :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'], + # Let XCode know that the static library referenced in -force_load below is + # created by this build step. + :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_example.a"], + } + s.pod_target_xcconfig = { + 'DEFINES_MODULE' => 'YES', + # Flutter.framework does not contain a i386 slice. + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386', + 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_example.a', + } +end \ No newline at end of file diff --git a/examples/flutter/example/rust_builder/pubspec.yaml b/examples/flutter/example/rust_builder/pubspec.yaml new file mode 100644 index 000000000..8245e08e4 --- /dev/null +++ b/examples/flutter/example/rust_builder/pubspec.yaml @@ -0,0 +1,34 @@ +name: rust_lib_example +description: "Utility to build Rust code" +version: 0.0.1 +publish_to: none + +environment: + sdk: '>=3.3.0 <4.0.0' + flutter: '>=3.3.0' + +dependencies: + flutter: + sdk: flutter + plugin_platform_interface: ^2.0.2 + +dev_dependencies: + ffi: ^2.0.2 + ffigen: ^11.0.0 + flutter_test: + sdk: flutter + flutter_lints: ^2.0.0 + +flutter: + plugin: + platforms: + android: + ffiPlugin: true + ios: + ffiPlugin: true + linux: + ffiPlugin: true + macos: + ffiPlugin: true + windows: + ffiPlugin: true diff --git a/examples/flutter/example/rust_builder/windows/.gitignore b/examples/flutter/example/rust_builder/windows/.gitignore new file mode 100644 index 000000000..b3eb2be16 --- /dev/null +++ b/examples/flutter/example/rust_builder/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/examples/flutter/example/rust_builder/windows/CMakeLists.txt b/examples/flutter/example/rust_builder/windows/CMakeLists.txt new file mode 100644 index 000000000..ad3705fda --- /dev/null +++ b/examples/flutter/example/rust_builder/windows/CMakeLists.txt @@ -0,0 +1,20 @@ +# The Flutter tooling requires that developers have a version of Visual Studio +# installed that includes CMake 3.14 or later. You should not increase this +# version, as doing so will cause the plugin to fail to compile for some +# customers of the plugin. +cmake_minimum_required(VERSION 3.14) + +# Project-level configuration. +set(PROJECT_NAME "rust_lib_example") +project(${PROJECT_NAME} LANGUAGES CXX) + +include("../cargokit/cmake/cargokit.cmake") +apply_cargokit(${PROJECT_NAME} ../../../../../../rust rust_lib_example "") + +# List of absolute paths to libraries that should be bundled with the plugin. +# This list could contain prebuilt libraries, or libraries created by an +# external build triggered from this build file. +set(rust_lib_example_bundled_libraries + "${${PROJECT_NAME}_cargokit_lib}" + PARENT_SCOPE +) diff --git a/examples/flutter/example/test_driver/integration_test.dart b/examples/flutter/example/test_driver/integration_test.dart new file mode 100644 index 000000000..b38629cca --- /dev/null +++ b/examples/flutter/example/test_driver/integration_test.dart @@ -0,0 +1,3 @@ +import 'package:integration_test/integration_test_driver.dart'; + +Future main() => integrationDriver(); diff --git a/examples/flutter/example/windows/flutter/generated_plugins.cmake b/examples/flutter/example/windows/flutter/generated_plugins.cmake index b93c4c30c..9e29f2c41 100644 --- a/examples/flutter/example/windows/flutter/generated_plugins.cmake +++ b/examples/flutter/example/windows/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + rust_lib_example ) set(PLUGIN_BUNDLED_LIBRARIES) From 50219cc8f38dee5a4ed39e045fb20becdb16253a Mon Sep 17 00:00:00 2001 From: bkioshn Date: Tue, 5 Nov 2024 08:46:43 +0700 Subject: [PATCH 15/23] fix: doc and comment Signed-off-by: bkioshn --- docs/src/guides/languages/flutter.md | 33 +++++++++++++++++++ earthly/flutter_rust_bridge/Earthfile | 1 + examples/flutter/example/Earthfile | 16 +++++++++ .../flutter/example/rust_builder/README.md | 3 +- .../cargokit/build_tool/README.md | 3 +- 5 files changed, 54 insertions(+), 2 deletions(-) diff --git a/docs/src/guides/languages/flutter.md b/docs/src/guides/languages/flutter.md index 819e91152..a4849103b 100644 --- a/docs/src/guides/languages/flutter.md +++ b/docs/src/guides/languages/flutter.md @@ -157,6 +157,39 @@ please follow this [guide](./../../onboarding/index.md). It is pretty strait forward for this builder process, because as a part of `+build` target we already creating a docker image. +## Enhancing Flutter + +### Integrating Flutter with Rust using `flutter_rust_bridge` + +The `flutter_rust_bridge` allows you to integrate Rust with Flutter app, while maintaining the rest of the app in +Dart. +This can be useful for situations where you need to run complex algorithms, handle data +processing, or interact with low-level system APIs, but still want to leverage the Flutter ecosystem +for UI and app management. + +Start by creating a new builder where all the necessary setup is done under the `flutter_rust_bridge+builder`, +then copy the Flutter project that already have `flutter_rust_bridge` setup. +Refer to for how to setup the project. + +```Earthfile +builder-frb: + FROM flutter_rust_bridge+builder + COPY . . +``` + +Then generate a binding between Rust and Flutter + +```Earthfile +# Generated necessary files for running Flutter web locally and save it locally. +code-generator-web: + FROM +builder-frb + DO flutter_rust_bridge+CODE_GENERATOR_WEB + + SAVE ARTIFACT ./web/pkg AS LOCAL ./example/web/pkg + SAVE ARTIFACT ./rust/src/frb_generated.rs AS LOCAL ./rust/src/frb_generated.rs + SAVE ARTIFACT ./lib/src AS LOCAL ./lib/src +``` + ## Conclusion You can see the final `Earthfile` diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 76f2c1c47..5553d55c8 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -5,6 +5,7 @@ IMPORT ../rust AS rust-ci # This will be refactored in the future # TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322 +# builder: Setup necessary tools for `flutter_rust_bridge` builder: FROM debian:stable-slim diff --git a/examples/flutter/example/Earthfile b/examples/flutter/example/Earthfile index 2b791cd6a..b12bcaf75 100644 --- a/examples/flutter/example/Earthfile +++ b/examples/flutter/example/Earthfile @@ -1,6 +1,7 @@ VERSION 0.8 IMPORT ../../../earthly/flutter AS flutter-ci +IMPORT ../../../earthly/flutter_rust_bridge AS flutter_rust_bridge # To see more available functions, navigate to earthly/flutter/Earthfile. @@ -39,3 +40,18 @@ build-web: ARG --required SENTRY_DSN DO flutter-ci+BUILD_WEB --WORKDIR=$WORKDIR --TARGET=$TARGET --SENTRY_DSN=$SENTRY_DSN + +# -----------------flutter_rust_bridge----------------- + +builder-frb: + FROM flutter_rust_bridge+builder + COPY . . + +# Generated necessary files for running Flutter web locally and save it locally. +code-generator-web: + FROM +builder-frb + DO flutter_rust_bridge+CODE_GENERATOR_WEB + + SAVE ARTIFACT ./web/pkg AS LOCAL ./example/web/pkg + SAVE ARTIFACT ./rust/src/frb_generated.rs AS LOCAL ./rust/src/frb_generated.rs + SAVE ARTIFACT ./lib/src AS LOCAL ./lib/src diff --git a/examples/flutter/example/rust_builder/README.md b/examples/flutter/example/rust_builder/README.md index 922615f9c..04b641243 100644 --- a/examples/flutter/example/rust_builder/README.md +++ b/examples/flutter/example/rust_builder/README.md @@ -1 +1,2 @@ -Please ignore this folder, which is just glue to build Rust with Flutter. \ No newline at end of file + +Please ignore this folder, which is just glue to build Rust with Flutter. diff --git a/examples/flutter/example/rust_builder/cargokit/build_tool/README.md b/examples/flutter/example/rust_builder/cargokit/build_tool/README.md index a878c2796..7da957870 100644 --- a/examples/flutter/example/rust_builder/cargokit/build_tool/README.md +++ b/examples/flutter/example/rust_builder/cargokit/build_tool/README.md @@ -1,5 +1,6 @@ + /// This is copied from Cargokit (which is the official way to use it currently) -/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin +/// Details: A sample command-line application with an entrypoint in `bin/`, library code in `lib/`, and example unit test in `test/`. From 163c49c3ca863f49c88af564052d5188fc4ef581 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Tue, 5 Nov 2024 09:11:54 +0700 Subject: [PATCH 16/23] fix: bash check Signed-off-by: bkioshn --- .../example/rust_builder/cargokit/{build_pod.sh => build_pod} | 4 +++- .../cargokit/{run_build_tool.sh => run_build_tool} | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) rename examples/flutter/example/rust_builder/cargokit/{build_pod.sh => build_pod} (97%) rename examples/flutter/example/rust_builder/cargokit/{run_build_tool.sh => run_build_tool} (97%) diff --git a/examples/flutter/example/rust_builder/cargokit/build_pod.sh b/examples/flutter/example/rust_builder/cargokit/build_pod similarity index 97% rename from examples/flutter/example/rust_builder/cargokit/build_pod.sh rename to examples/flutter/example/rust_builder/cargokit/build_pod index ed0e0d987..98d88d363 100755 --- a/examples/flutter/example/rust_builder/cargokit/build_pod.sh +++ b/examples/flutter/example/rust_builder/cargokit/build_pod @@ -1,4 +1,6 @@ -#!/bin/sh +# Delete this line to use the file + +!/bin/sh set -e BASEDIR=$(dirname "$0") diff --git a/examples/flutter/example/rust_builder/cargokit/run_build_tool.sh b/examples/flutter/example/rust_builder/cargokit/run_build_tool similarity index 97% rename from examples/flutter/example/rust_builder/cargokit/run_build_tool.sh rename to examples/flutter/example/rust_builder/cargokit/run_build_tool index 6e594a23d..62fbd78f3 100755 --- a/examples/flutter/example/rust_builder/cargokit/run_build_tool.sh +++ b/examples/flutter/example/rust_builder/cargokit/run_build_tool @@ -1,4 +1,6 @@ -#!/usr/bin/env bash +# Delete this line to use the file + +# !/usr/bin/env bash set -e From 3f2323930b6ca76b4762e5c11df4a1dbf4fddc19 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Wed, 6 Nov 2024 19:52:00 +0700 Subject: [PATCH 17/23] fix: flutter_rust_bridge Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 8 ++++++-- examples/flutter/example/Earthfile | 7 ++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 5553d55c8..b0b70eed6 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -18,7 +18,9 @@ builder: tar \ xz-utils \ git \ - build-essential + build-essential \ + curl \ + unzip DO flutter-ci+INSTALL_FLUTTER DO rust-ci+INSTALL_RUST @@ -28,5 +30,7 @@ builder: CODE_GENERATOR_WEB: FUNCTION - RUN flutter_rust_bridge_codegen generate + RUN flutter_rust_bridge_codegen generate --default-external-library-loader-web-prefix=/assets/packages/catalyst_key_derivation/assets/js/ RUN flutter_rust_bridge_codegen build-web + + RUN mkdir -p assets/js/ && mv web/pkg/ assets/js/ diff --git a/examples/flutter/example/Earthfile b/examples/flutter/example/Earthfile index b12bcaf75..c1817fb23 100644 --- a/examples/flutter/example/Earthfile +++ b/examples/flutter/example/Earthfile @@ -51,7 +51,8 @@ builder-frb: code-generator-web: FROM +builder-frb DO flutter_rust_bridge+CODE_GENERATOR_WEB - - SAVE ARTIFACT ./web/pkg AS LOCAL ./example/web/pkg + # Don't want this gitignore file in the artifact. + RUN rm -rf ./assets/js/.gitignore + SAVE ARTIFACT ./assets/js AS LOCAL ./assets/js SAVE ARTIFACT ./rust/src/frb_generated.rs AS LOCAL ./rust/src/frb_generated.rs - SAVE ARTIFACT ./lib/src AS LOCAL ./lib/src + SAVE ARTIFACT ./lib/src AS LOCAL ./lib/src \ No newline at end of file From 3819260adef939aa4f0d27a32067b2733896df7e Mon Sep 17 00:00:00 2001 From: bkioshn Date: Wed, 6 Nov 2024 19:52:47 +0700 Subject: [PATCH 18/23] fix: auto gen file Signed-off-by: bkioshn --- examples/flutter/example/lib/src/rust/frb_generated.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/flutter/example/lib/src/rust/frb_generated.dart b/examples/flutter/example/lib/src/rust/frb_generated.dart index 40bf6e1c9..1178b437f 100644 --- a/examples/flutter/example/lib/src/rust/frb_generated.dart +++ b/examples/flutter/example/lib/src/rust/frb_generated.dart @@ -74,7 +74,7 @@ class RustLib extends BaseEntrypoint { ExternalLibraryLoaderConfig( stem: 'rust_lib_example', ioDirectory: 'rust/target/release/', - webPrefix: 'pkg/', + webPrefix: '/assets/packages/catalyst_key_derivation/assets/js/', ); } From 13c2417e3f74ddfa5737b96303fe6b2fdf4f9143 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Wed, 6 Nov 2024 20:05:12 +0700 Subject: [PATCH 19/23] fix: cp file command Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index b0b70eed6..80311f27f 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -33,4 +33,5 @@ CODE_GENERATOR_WEB: RUN flutter_rust_bridge_codegen generate --default-external-library-loader-web-prefix=/assets/packages/catalyst_key_derivation/assets/js/ RUN flutter_rust_bridge_codegen build-web - RUN mkdir -p assets/js/ && mv web/pkg/ assets/js/ + RUN mkdir -p assets/js && cp -rf ./web/pkg/ assets/js/ + From ea6c434be248d0afc94bc08c1dbcdf27effae0f6 Mon Sep 17 00:00:00 2001 From: bkioshn Date: Wed, 6 Nov 2024 20:11:57 +0700 Subject: [PATCH 20/23] fix: rm file command Signed-off-by: bkioshn --- earthly/flutter_rust_bridge/Earthfile | 3 ++- examples/flutter/example/Earthfile | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index 80311f27f..b385eed28 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -34,4 +34,5 @@ CODE_GENERATOR_WEB: RUN flutter_rust_bridge_codegen build-web RUN mkdir -p assets/js && cp -rf ./web/pkg/ assets/js/ - + # Don't want this gitignore file. + RUN rm -rf ./assets/js/.gitignore diff --git a/examples/flutter/example/Earthfile b/examples/flutter/example/Earthfile index c1817fb23..9f87dde07 100644 --- a/examples/flutter/example/Earthfile +++ b/examples/flutter/example/Earthfile @@ -51,8 +51,7 @@ builder-frb: code-generator-web: FROM +builder-frb DO flutter_rust_bridge+CODE_GENERATOR_WEB - # Don't want this gitignore file in the artifact. - RUN rm -rf ./assets/js/.gitignore + SAVE ARTIFACT ./assets/js AS LOCAL ./assets/js SAVE ARTIFACT ./rust/src/frb_generated.rs AS LOCAL ./rust/src/frb_generated.rs SAVE ARTIFACT ./lib/src AS LOCAL ./lib/src \ No newline at end of file From 8097131bb8b719fbbf240f2d5902d95643fe4966 Mon Sep 17 00:00:00 2001 From: Dominik Toton Date: Fri, 8 Nov 2024 13:22:50 +0100 Subject: [PATCH 21/23] fix: copy contents of pkg folder, not the folder itself --- earthly/flutter_rust_bridge/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/earthly/flutter_rust_bridge/Earthfile b/earthly/flutter_rust_bridge/Earthfile index b385eed28..3a4f6992e 100644 --- a/earthly/flutter_rust_bridge/Earthfile +++ b/earthly/flutter_rust_bridge/Earthfile @@ -33,6 +33,6 @@ CODE_GENERATOR_WEB: RUN flutter_rust_bridge_codegen generate --default-external-library-loader-web-prefix=/assets/packages/catalyst_key_derivation/assets/js/ RUN flutter_rust_bridge_codegen build-web - RUN mkdir -p assets/js && cp -rf ./web/pkg/ assets/js/ + RUN mkdir -p assets/js && cp -rf ./web/pkg/* assets/js/ # Don't want this gitignore file. RUN rm -rf ./assets/js/.gitignore From db0dd393437c2cc0f9c4f19fced4e0a543dfc92d Mon Sep 17 00:00:00 2001 From: bkioshn Date: Fri, 8 Nov 2024 22:23:45 +0700 Subject: [PATCH 22/23] fix: remove commented code Signed-off-by: bkioshn --- examples/flutter/example/lib/main.dart | 158 ------------------------- 1 file changed, 158 deletions(-) diff --git a/examples/flutter/example/lib/main.dart b/examples/flutter/example/lib/main.dart index 8233c02ed..0a542e87e 100644 --- a/examples/flutter/example/lib/main.dart +++ b/examples/flutter/example/lib/main.dart @@ -1,161 +1,3 @@ -// The original content is temporarily commented out to allow generating a self-contained demo - feel free to uncomment later. - -// // The original content is temporarily commented out to allow generating a self-contained demo - feel free to uncomment later. -// -// // import 'package:flutter/material.dart'; -// // -// // void main() { -// // runApp(const MyApp()); -// // } -// // -// // class MyApp extends StatelessWidget { -// // const MyApp({super.key}); -// // -// // // This widget is the root of your application. -// // @override -// // Widget build(BuildContext context) { -// // return MaterialApp( -// // title: 'Flutter Demo', -// // theme: ThemeData( -// // // This is the theme of your application. -// // // -// // // TRY THIS: Try running your application with "flutter run". You'll see -// // // the application has a purple toolbar. Then, without quitting the app, -// // // try changing the seedColor in the colorScheme below to Colors.green -// // // and then invoke "hot reload" (save your changes or press the "hot -// // // reload" button in a Flutter-supported IDE, or press "r" if you used -// // // the command line to start the app). -// // // -// // // Notice that the counter didn't reset back to zero; the application -// // // state is not lost during the reload. To reset the state, use hot -// // // restart instead. -// // // -// // // This works for code too, not just values: Most code changes can be -// // // tested with just a hot reload. -// // colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), -// // useMaterial3: true, -// // ), -// // home: const MyHomePage(title: 'Flutter Demo Home Page'), -// // ); -// // } -// // } -// // -// // class MyHomePage extends StatefulWidget { -// // const MyHomePage({super.key, required this.title}); -// // -// // // This widget is the home page of your application. It is stateful, meaning -// // // that it has a State object (defined below) that contains fields that affect -// // // how it looks. -// // -// // // This class is the configuration for the state. It holds the values (in this -// // // case the title) provided by the parent (in this case the App widget) and -// // // used by the build method of the State. Fields in a Widget subclass are -// // // always marked "final". -// // -// // final String title; -// // -// // @override -// // State createState() => _MyHomePageState(); -// // } -// // -// // class _MyHomePageState extends State { -// // int _counter = 0; -// // -// // void _incrementCounter() { -// // setState(() { -// // // This call to setState tells the Flutter framework that something has -// // // changed in this State, which causes it to rerun the build method below -// // // so that the display can reflect the updated values. If we changed -// // // _counter without calling setState(), then the build method would not be -// // // called again, and so nothing would appear to happen. -// // _counter++; -// // }); -// // } -// // -// // @override -// // Widget build(BuildContext context) { -// // // This method is rerun every time setState is called, for instance as done -// // // by the _incrementCounter method above. -// // // -// // // The Flutter framework has been optimized to make rerunning build methods -// // // fast, so that you can just rebuild anything that needs updating rather -// // // than having to individually change instances of widgets. -// // return Scaffold( -// // appBar: AppBar( -// // // TRY THIS: Try changing the color here to a specific color (to -// // // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar -// // // change color while the other colors stay the same. -// // backgroundColor: Theme.of(context).colorScheme.inversePrimary, -// // // Here we take the value from the MyHomePage object that was created by -// // // the App.build method, and use it to set our appbar title. -// // title: Text(widget.title), -// // ), -// // body: Center( -// // // Center is a layout widget. It takes a single child and positions it -// // // in the middle of the parent. -// // child: Column( -// // // Column is also a layout widget. It takes a list of children and -// // // arranges them vertically. By default, it sizes itself to fit its -// // // children horizontally, and tries to be as tall as its parent. -// // // -// // // Column has various properties to control how it sizes itself and -// // // how it positions its children. Here we use mainAxisAlignment to -// // // center the children vertically; the main axis here is the vertical -// // // axis because Columns are vertical (the cross axis would be -// // // horizontal). -// // // -// // // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint" -// // // action in the IDE, or press "p" in the console), to see the -// // // wireframe for each widget. -// // mainAxisAlignment: MainAxisAlignment.center, -// // children: [ -// // const Text( -// // 'You have pushed the button this many times:', -// // ), -// // Text( -// // '$_counter', -// // style: Theme.of(context).textTheme.headlineMedium, -// // ), -// // ], -// // ), -// // ), -// // floatingActionButton: FloatingActionButton( -// // onPressed: _incrementCounter, -// // tooltip: 'Increment', -// // child: const Icon(Icons.add), -// // ), // This trailing comma makes auto-formatting nicer for build methods. -// // ); -// // } -// // } -// // -// -// import 'package:flutter/material.dart'; -// import 'package:example/src/rust/api/simple.dart'; -// import 'package:example/src/rust/frb_generated.dart'; -// -// Future main() async { -// await RustLib.init(); -// runApp(const MyApp()); -// } -// -// class MyApp extends StatelessWidget { -// const MyApp({super.key}); -// -// @override -// Widget build(BuildContext context) { -// return MaterialApp( -// home: Scaffold( -// appBar: AppBar(title: const Text('flutter_rust_bridge quickstart')), -// body: Center( -// child: Text( -// 'Action: Call Rust `greet("Tom")`\nResult: `${greet(name: "Tom")}`'), -// ), -// ), -// ); -// } -// } -// - import 'package:flutter/material.dart'; import 'package:example/src/rust/api/simple.dart'; import 'package:example/src/rust/frb_generated.dart'; From 8fd00c17972c60f43e5dd7f1d6f57f87a7a3a8ca Mon Sep 17 00:00:00 2001 From: bkioshn Date: Fri, 8 Nov 2024 22:31:18 +0700 Subject: [PATCH 23/23] doc: update flutter readme --- docs/src/guides/languages/flutter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/guides/languages/flutter.md b/docs/src/guides/languages/flutter.md index a4849103b..7472d7aa8 100644 --- a/docs/src/guides/languages/flutter.md +++ b/docs/src/guides/languages/flutter.md @@ -185,7 +185,7 @@ code-generator-web: FROM +builder-frb DO flutter_rust_bridge+CODE_GENERATOR_WEB - SAVE ARTIFACT ./web/pkg AS LOCAL ./example/web/pkg + SAVE ARTIFACT ./assets/js AS LOCAL ./assets/js SAVE ARTIFACT ./rust/src/frb_generated.rs AS LOCAL ./rust/src/frb_generated.rs SAVE ARTIFACT ./lib/src AS LOCAL ./lib/src ```