From 5bece9c8ef39350c8cd651a35a8286d370d4bf03 Mon Sep 17 00:00:00 2001
From: 007gzs <007gzs@gmail.com>
Date: Thu, 27 Feb 2025 14:15:50 +0800
Subject: [PATCH] fix rust_wasm_build (#1824)

---
 .github/workflows/build-and-push-wasm-plugin-image.yaml | 5 +++++
 plugins/wasm-rust/Dockerfile                            | 4 ++--
 plugins/wasm-rust/extensions/ai-data-masking/.buildrc   | 1 -
 plugins/wasm-rust/extensions/ai-data-masking/.prebuild  | 3 +++
 plugins/wasm-rust/src/event_stream.rs                   | 5 +----
 5 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 plugins/wasm-rust/extensions/ai-data-masking/.buildrc
 create mode 100644 plugins/wasm-rust/extensions/ai-data-masking/.prebuild

diff --git a/.github/workflows/build-and-push-wasm-plugin-image.yaml b/.github/workflows/build-and-push-wasm-plugin-image.yaml
index 41935de210..2406582296 100644
--- a/.github/workflows/build-and-push-wasm-plugin-image.yaml
+++ b/.github/workflows/build-and-push-wasm-plugin-image.yaml
@@ -133,6 +133,11 @@ jobs:
           command="
           set -e
           cd /workspace/plugins/wasm-rust/extensions/${PLUGIN_NAME}
+          if [ -f ./.prebuild ]; then
+            echo 'Found .prebuild file, sourcing it...'
+            . ./.prebuild
+          fi
+          rustup target add wasm32-wasip1
           cargo build --target wasm32-wasip1 --release
           cp target/wasm32-wasip1/release/*.wasm plugin.wasm
           tar czvf plugin.tar.gz plugin.wasm
diff --git a/plugins/wasm-rust/Dockerfile b/plugins/wasm-rust/Dockerfile
index b2c6725b14..ffdea8c537 100644
--- a/plugins/wasm-rust/Dockerfile
+++ b/plugins/wasm-rust/Dockerfile
@@ -3,10 +3,10 @@ WORKDIR /workspace
 RUN rustup target add wasm32-wasip1
 ARG PLUGIN_NAME="say-hello"
 ARG BUILD_OPTS="--release"
-ARG BUILDRC=".buildrc"
+ARG PREBUILD=".prebuild"
 COPY . .
 WORKDIR /workspace/extensions/$PLUGIN_NAME
-RUN if [ -f $BUILDRC ]; then sh $BUILDRC; fi
+RUN if [ -f $PREBUILD ]; then sh $PREBUILD; fi
 RUN cargo build --target wasm32-wasip1 $BUILD_OPTS \
     && cp target/wasm32-wasip1/release/*.wasm /main.wasm
 
diff --git a/plugins/wasm-rust/extensions/ai-data-masking/.buildrc b/plugins/wasm-rust/extensions/ai-data-masking/.buildrc
deleted file mode 100644
index bd317b8605..0000000000
--- a/plugins/wasm-rust/extensions/ai-data-masking/.buildrc
+++ /dev/null
@@ -1 +0,0 @@
-apt update && apt-get install gcc gcc-multilib llvm clang -y && apt clean
\ No newline at end of file
diff --git a/plugins/wasm-rust/extensions/ai-data-masking/.prebuild b/plugins/wasm-rust/extensions/ai-data-masking/.prebuild
new file mode 100644
index 0000000000..ba1b9b5d6d
--- /dev/null
+++ b/plugins/wasm-rust/extensions/ai-data-masking/.prebuild
@@ -0,0 +1,3 @@
+apt-get update
+apt-get install gcc gcc-multilib llvm clang -y
+apt-get clean
diff --git a/plugins/wasm-rust/src/event_stream.rs b/plugins/wasm-rust/src/event_stream.rs
index 97715dcac1..cb12a35f00 100644
--- a/plugins/wasm-rust/src/event_stream.rs
+++ b/plugins/wasm-rust/src/event_stream.rs
@@ -108,10 +108,7 @@ impl EventStream {
     }
 
     fn is_2eol(&self, i: usize) -> Option<usize> {
-        let size1 = match self.is_eol(i) {
-            None => return None,
-            Some(size1) => size1,
-        };
+        let size1 = self.is_eol(i)?;
         if i + size1 < self.buffer.len() {
             match self.is_eol(i + size1) {
                 None => {