Merge branch 'main' of https://github.com/bmax121/APatch

Author: DataEraserC

.github/scripts/telegram_url.py

@@ -3,7 +3,6 @@
 import sys
 import urllib.parse
 
-
 url = f'https://api.telegram.org/bot{os.environ["BOT_TOKEN"]}'
 url += f'/sendMediaGroup?chat_id={urllib.parse.quote(sys.argv[1])}&media='
 
@@ -17,8 +16,9 @@
 caption = f"[{commit_id}]({commit_url})\n{msg}"[:1024]
 
 data = json.dumps([
-    {"type": "document", "media": "attach://Release","caption": caption,"parse_mode":"MarkdownV2"}
-    ])
+    {"type": "document", "media": "attach://Release1"},
+    {"type": "document", "media": "attach://Release2", "caption": caption, "parse_mode": "MarkdownV2"}
+])
 
 url += urllib.parse.quote(data)
 print(url)

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -74,7 +74,7 @@ jobs:
           echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
           echo 'android.native.buildOutput=verbose' >> gradle.properties
           sed -i 's/org.gradle.configuration-cache=true//g' gradle.properties
-          ./gradlew clean assembleRelease
+          ./gradlew clean assembleDebug assembleRelease
           echo "BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)" >> $GITHUB_ENV
 
       - name: Sign Release
@@ -93,30 +93,58 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
           zipAlign: true
 
-      - name: Upload build artifact
+      - name: Sign Debug APK
         env:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
         if: ${{ env.SIGNING_KEY != '' }}
+        continue-on-error: true
+        uses: kevin-david/zipalign-sign-android-release@v2
+        id: sign_debug_app
+        with:
+          releaseDirectory: app/build/outputs/apk/debug
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+          zipAlign: true
+
+      - name: Upload mappings
         uses: actions/upload-artifact@v5
+        with:
+          name: "mappings"
+          path: "app/build/outputs/mapping/release/"
+
+      - name: Upload build artifact
+        env:
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+        if: ${{ env.SIGNING_KEY != '' }}
+        uses: actions/upload-artifact@v6
         with:
           name: APatch
-          path: ${{steps.sign_app.outputs.signedReleaseFile}}
+          path: |
+            ${{ steps.sign_app.outputs.signedReleaseFile }}
+            ${{ steps.sign_debug_app.outputs.signedReleaseFile }}
 
       - name: Post to channel
-        if: ${{github.event_name != 'pull_request' && github.ref == 'refs/heads/main' && github.ref_type != 'tag'}}
+        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' && github.ref_type != 'tag' }}
         env:
           BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
           COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
           COMMIT_URL: ${{ github.event.head_commit.url }}
           COMMIT_ID: ${{ github.event.head_commit.id }}
         run: |
-          if [ ! -z "${{ secrets.BOT_TOKEN }}" ]; then
-            OUTPUT="app/build/outputs/apk/release"
-            export Release=$(find $OUTPUT -name "*.apk")
-            URL=$(python3 .github/scripts/telegram_url.py -1002058433411)
-            curl -v "$URL" -F Release=@${{ steps.sign_app.outputs.signedReleaseFile }}
-            URL=$(python3 .github/scripts/telegram_url.py -1001910818234)
-            curl -v "$URL" -F Release=@${{ steps.sign_app.outputs.signedReleaseFile }}
+          if [ -n "${BOT_TOKEN}" ]; then
+            CHANNELS=(-1002058433411 -1001910818234)
+            RELEASE_APK="${{ steps.sign_app.outputs.signedReleaseFile }}"
+            DEBUG_APK="${{ steps.sign_debug_app.outputs.signedReleaseFile }}"
+          
+            for CHANNEL in "${CHANNELS[@]}"; do
+              URL=$(python3 .github/scripts/telegram_url.py $CHANNEL)
+              if [ -f "$RELEASE_APK" ] && [ -f "$DEBUG_APK" ]; then
+                curl -v "$URL" -F "Release1=@$RELEASE_APK" -F "Release2=@$DEBUG_APK"
+              fi
+            done
           fi
 
       - name: Release apk

apd/Cargo.lock

@@ -6,6 +6,7 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+mlua = { version = "0.11.5", features = ["lua54","vendored"] }
 anyhow = "1"
 csv = "1.3.1"
 clap = { version = "4", features = ["derive"] }

apd/Cargo.toml

@@ -81,7 +81,13 @@ enum Module {
         // module id
         id: String,
     },
-
+    /// module lua runner
+    Lua {
+        // module id
+        id: String,
+        // lua function
+        function: String,
+    },
     /// list all modules
     List,
 }
@@ -142,6 +148,9 @@ pub fn run() -> Result<()> {
                 Module::Install { zip } => module::install_module(&zip),
                 Module::Uninstall { id } => module::uninstall_module(&id),
                 Module::Action { id } => module::run_action(&id),
+                Module::Lua { id, function } => {
+                    module::run_lua(&id, &function, false, true).map_err(|e| anyhow::anyhow!("{}", e))
+                }
                 Module::Enable { id } => module::enable_module(&id),
                 Module::Disable { id } => module::disable_module(&id),
                 Module::List => module::list_modules(),

apd/src/cli.rs

@@ -407,7 +407,9 @@ pub fn on_post_data_fs(superkey: Option<String>) -> Result<()> {
     if let Err(e) = module::exec_stage_script("post-fs-data", true) {
         warn!("exec post-fs-data scripts failed: {}", e);
     }
-
+    if let Err(e) = module::exec_stage_lua("post-fs-data",true, superkey.as_deref().unwrap_or("")) {
+        warn!("Failed to exec post-fs-data lua: {}", e);
+    }
     // load system.prop
     if let Err(e) = module::load_system_prop() {
         warn!("load system.prop failed: {}", e);
@@ -470,8 +472,6 @@ pub fn on_post_data_fs(superkey: Option<String>) -> Result<()> {
     info!("remove update flag");
     let _ = fs::remove_file(module_update_flag);
 
-    
-
     run_stage("post-mount", superkey, true);
 
     env::set_current_dir("/").with_context(|| "failed to chdir to /")?;
@@ -487,7 +487,7 @@ fn run_stage(stage: &str, superkey: Option<String>, block: bool) {
         return;
     }
 
-    if utils::is_safe_mode(superkey) {
+    if utils::is_safe_mode(superkey.clone()) {
         warn!("safe mode, skip {stage} scripts");
         if let Err(e) = module::disable_all_modules() {
             warn!("disable all modules failed: {}", e);
@@ -501,6 +501,9 @@ fn run_stage(stage: &str, superkey: Option<String>, block: bool) {
     if let Err(e) = module::exec_stage_script(stage, block) {
         warn!("Failed to exec {stage} scripts: {e}");
     }
+    if let Err(e) = module::exec_stage_lua(stage,block,superkey.as_deref().unwrap_or("")) {
+        warn!("Failed to exec {stage} lua: {e}");
+    }
 }
 
 pub fn on_services(superkey: Option<String>) -> Result<()> {