capacitor-dex-editor 0.0.63 → 0.0.65

package/android/build.gradle

@@ -9,16 +9,13 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.7.2'
-        classpath 'org.mozilla.rust-android-gradle:plugin:0.9.6'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
 android {
     namespace "com.aetherlink.dexeditor"
@@ -75,18 +72,3 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
 }
-
-// Rust 编译配置
-cargo {
-    module = "../rust"
-    libname = "dex_rust"
-    targets = ["arm", "arm64", "x86", "x86_64"]
-    profile = "release"
-}
-
-// 将 Rust 编译任务添加到构建流程
-tasks.configureEach { task ->
-    if ((task.name == 'javaPreCompileDebug' || task.name == 'javaPreCompileRelease')) {
-        task.dependsOn 'cargoBuild'
-    }
-}

package/android/src/main/java/com/aetherlink/dexeditor/DexManager.java

@@ -150,6 +150,7 @@ public class DexManager {
         String sessionId;
         String apkPath;
         Map<String, DexBackedDexFile> dexFiles;
+        Map<String, byte[]> dexBytes;  // DEX 字节数据，用于 Rust 搜索
         Map<String, ClassDef> modifiedClasses;
         // 使用 LRU 缓存限制内存，最多缓存 200 个类
         Map<String, String> smaliCache = new java.util.LinkedHashMap<String, String>(200, 0.75f, true) {
@@ -164,11 +165,15 @@ public class DexManager {
             this.sessionId = sessionId;
             this.apkPath = apkPath;
             this.dexFiles = new HashMap<>();
+            this.dexBytes = new HashMap<>();
             this.modifiedClasses = new HashMap<>();
         }
 
-        void addDex(String dexName, DexBackedDexFile dexFile) {
+        void addDex(String dexName, DexBackedDexFile dexFile, byte[] bytes) {
             this.dexFiles.put(dexName, dexFile);
+            if (bytes != null) {
+                this.dexBytes.put(dexName, bytes);
+            }
         }
     }
 
@@ -1638,10 +1643,11 @@ public class DexManager {
                     baos.write(buffer, 0, len);
                 }
                 is.close();
+                byte[] dexData = baos.toByteArray();
                 
                 // 解析 DEX
-                DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), baos.toByteArray());
-                multiSession.addDex(dexName, dexFile);
+                DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexData);
+                multiSession.addDex(dexName, dexFile, dexData);
                 totalClasses += dexFile.getClasses().size();
                 
                 Log.d(TAG, "Loaded DEX: " + dexName + " with " + dexFile.getClasses().size() + " classes");
@@ -1768,10 +1774,16 @@ public class DexManager {
             throw new IllegalArgumentException("Session not found: " + sessionId);
         }
         
-        // 尝试使用 Rust 实现（仅对 string/code 搜索有显著提升）
-        // 目前 Rust 实现需要 DEX 字节数据，暂时禁用
-        // TODO: 实现 Rust 加速搜索
+        // 尝试使用 Rust 实现进行搜索
+        if (RustDex.isAvailable() && !session.dexBytes.isEmpty()) {
+            try {
+                return searchWithRust(session, query, searchType, caseSensitive, maxResults);
+            } catch (Exception e) {
+                Log.w(TAG, "Rust search failed, falling back to Java: " + e.getMessage());
+            }
+        }
         
+        // Java 回退实现
         JSObject result = new JSObject();
         JSArray results = new JSArray();
         String queryMatch = caseSensitive ? query : query.toLowerCase();
@@ -1888,6 +1900,56 @@ public class DexManager {
         return result;
     }
 
+    /**
+     * 使用 Rust 实现搜索（高性能）
+     */
+    private JSObject searchWithRust(MultiDexSession session, String query, String searchType,
+                                     boolean caseSensitive, int maxResults) throws Exception {
+        JSObject result = new JSObject();
+        JSArray allResults = new JSArray();
+        
+        for (Map.Entry<String, byte[]> entry : session.dexBytes.entrySet()) {
+            String dexName = entry.getKey();
+            byte[] dexData = entry.getValue();
+            
+            // 调用 Rust 搜索
+            String jsonResult = RustDex.searchInDex(dexData, query, searchType, caseSensitive, maxResults);
+            
+            if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                // 解析 Rust 返回的 JSON
+                org.json.JSONObject rustResult = new org.json.JSONObject(jsonResult);
+                org.json.JSONArray rustResults = rustResult.optJSONArray("results");
+                
+                if (rustResults != null) {
+                    for (int i = 0; i < rustResults.length() && allResults.length() < maxResults; i++) {
+                        org.json.JSONObject item = rustResults.getJSONObject(i);
+                        JSObject jsItem = new JSObject();
+                        jsItem.put("type", item.optString("type", searchType));
+                        jsItem.put("className", item.optString("className", ""));
+                        jsItem.put("dexFile", dexName);
+                        if (item.has("methodName")) {
+                            jsItem.put("methodName", item.getString("methodName"));
+                        }
+                        if (item.has("fieldName")) {
+                            jsItem.put("fieldName", item.getString("fieldName"));
+                        }
+                        allResults.put(jsItem);
+                    }
+                }
+            }
+            
+            if (allResults.length() >= maxResults) break;
+        }
+        
+        result.put("query", query);
+        result.put("searchType", searchType);
+        result.put("total", allResults.length());
+        result.put("results", allResults);
+        result.put("engine", "rust");
+        
+        return result;
+    }
+
     /**
      * 获取类的 Smali 代码（内部方法）
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-dex-editor",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "description": "Capacitor-plugin-for-editing-DEX-files-in-APK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",