capacitor-dex-editor 0.0.65 → 0.0.67

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

@@ -152,13 +152,6 @@ public class DexManager {
         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) {
-            @Override
-            protected boolean removeEldestEntry(Map.Entry<String, String> eldest) {
-                return size() > 200;
-            }
-        };
         boolean modified = false;
 
         MultiDexSession(String sessionId, String apkPath) {
@@ -1708,7 +1701,7 @@ public class DexManager {
     }
 
     /**
-     * 获取多 DEX 会话中的类列表（支持分页和过滤）
+     * 获取多 DEX 会话中的类列表（Rust 实现）
      */
     public JSObject getClassesFromMultiSession(String sessionId, String packageFilter, int offset, int limit) throws Exception {
         MultiDexSession session = multiDexSessions.get(sessionId);
@@ -1716,26 +1709,29 @@ public class DexManager {
             throw new IllegalArgumentException("Session not found: " + sessionId);
         }
         
+        if (!RustDex.isAvailable() || session.dexBytes.isEmpty()) {
+            throw new RuntimeException("Rust DEX library not available");
+        }
+        
         JSObject result = new JSObject();
         JSArray classes = new JSArray();
         List<String> allClasses = new ArrayList<>();
+        String filter = packageFilter != null ? packageFilter : "";
         
-        // 收集所有类
-        for (Map.Entry<String, DexBackedDexFile> entry : session.dexFiles.entrySet()) {
+        // 使用 Rust 获取每个 DEX 的类列表
+        for (Map.Entry<String, byte[]> entry : session.dexBytes.entrySet()) {
             String dexName = entry.getKey();
-            DexBackedDexFile dexFile = entry.getValue();
+            byte[] dexData = entry.getValue();
             
-            for (ClassDef classDef : dexFile.getClasses()) {
-                String className = convertTypeToClassName(classDef.getType());
-                
-                // 包名过滤
-                if (packageFilter != null && !packageFilter.isEmpty()) {
-                    if (!className.startsWith(packageFilter)) {
-                        continue;
+            String jsonResult = RustDex.listClasses(dexData, filter, 0, 100000);
+            if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                org.json.JSONObject rustResult = new org.json.JSONObject(jsonResult);
+                org.json.JSONArray rustClasses = rustResult.optJSONArray("classes");
+                if (rustClasses != null) {
+                    for (int i = 0; i < rustClasses.length(); i++) {
+                        allClasses.add(rustClasses.getString(i) + "|" + dexName);
                     }
                 }
-                
-                allClasses.add(className + "|" + dexName);
             }
         }
         
@@ -1759,13 +1755,13 @@ public class DexManager {
         result.put("limit", limit);
         result.put("classes", classes);
         result.put("hasMore", end < total);
+        result.put("engine", "rust");
         
         return result;
     }
 
     /**
-     * 在多 DEX 会话中搜索
-     * 优先使用 Rust 实现，如果不可用则回退到 Java 实现
+     * 在多 DEX 会话中搜索（Rust 实现）
      */
     public JSObject searchInMultiSession(String sessionId, String query, String searchType, 
                                           boolean caseSensitive, int maxResults) throws Exception {
@@ -1774,137 +1770,14 @@ public class DexManager {
             throw new IllegalArgumentException("Session not found: " + sessionId);
         }
         
-        // 尝试使用 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());
-            }
+        if (!RustDex.isAvailable()) {
+            throw new RuntimeException("Rust DEX library not available");
         }
         
-        // Java 回退实现
-        JSObject result = new JSObject();
-        JSArray results = new JSArray();
-        String queryMatch = caseSensitive ? query : query.toLowerCase();
-        
-        outerLoop:
-        for (Map.Entry<String, DexBackedDexFile> entry : session.dexFiles.entrySet()) {
-            String dexName = entry.getKey();
-            DexBackedDexFile dexFile = entry.getValue();
-            
-            for (ClassDef classDef : dexFile.getClasses()) {
-                if (results.length() >= maxResults) break outerLoop;
-                
-                String className = convertTypeToClassName(classDef.getType());
-                String classNameMatch = caseSensitive ? className : className.toLowerCase();
-                
-                switch (searchType) {
-                    case "class":
-                        if (classNameMatch.contains(queryMatch)) {
-                            JSObject item = new JSObject();
-                            item.put("type", "class");
-                            item.put("className", className);
-                            item.put("dexFile", dexName);
-                            results.put(item);
-                        }
-                        break;
-                        
-                    case "package":
-                        if (classNameMatch.startsWith(queryMatch)) {
-                            JSObject item = new JSObject();
-                            item.put("type", "package");
-                            item.put("className", className);
-                            item.put("dexFile", dexName);
-                            results.put(item);
-                        }
-                        break;
-                        
-                    case "method":
-                        for (Method method : classDef.getMethods()) {
-                            if (results.length() >= maxResults) break outerLoop;
-                            String methodName = method.getName();
-                            String methodMatch = caseSensitive ? methodName : methodName.toLowerCase();
-                            if (methodMatch.contains(queryMatch)) {
-                                JSObject item = new JSObject();
-                                item.put("type", "method");
-                                item.put("className", className);
-                                item.put("methodName", methodName);
-                                item.put("dexFile", dexName);
-                                results.put(item);
-                            }
-                        }
-                        break;
-                        
-                    case "field":
-                        for (Field field : classDef.getFields()) {
-                            if (results.length() >= maxResults) break outerLoop;
-                            String fieldName = field.getName();
-                            String fieldMatch = caseSensitive ? fieldName : fieldName.toLowerCase();
-                            if (fieldMatch.contains(queryMatch)) {
-                                JSObject item = new JSObject();
-                                item.put("type", "field");
-                                item.put("className", className);
-                                item.put("fieldName", fieldName);
-                                item.put("dexFile", dexName);
-                                results.put(item);
-                            }
-                        }
-                        break;
-                        
-                    case "string":
-                    case "code":
-                        // 使用缓存的 smali 搜索
-                        String smali = getCachedSmali(session, className, dexFile, classDef);
-                        String smaliMatch = caseSensitive ? smali : smali.toLowerCase();
-                        if (smaliMatch.contains(queryMatch)) {
-                            JSObject item = new JSObject();
-                            item.put("type", searchType);
-                            item.put("className", className);
-                            item.put("dexFile", dexName);
-                            // 找到匹配的行
-                            String[] lines = smali.split("\n");
-                            for (int i = 0; i < lines.length; i++) {
-                                String lineMatch = caseSensitive ? lines[i] : lines[i].toLowerCase();
-                                if (lineMatch.contains(queryMatch)) {
-                                    item.put("line", i + 1);
-                                    item.put("content", lines[i].trim());
-                                    break;
-                                }
-                            }
-                            results.put(item);
-                        }
-                        break;
-                        
-                    case "int":
-                        // 搜索整数常量（使用缓存）
-                        String smaliForInt = getCachedSmali(session, className, dexFile, classDef);
-                        if (smaliForInt.contains("0x" + query) || smaliForInt.contains(" " + query + "\n") || 
-                            smaliForInt.contains(" " + query + " ")) {
-                            JSObject item = new JSObject();
-                            item.put("type", "int");
-                            item.put("className", className);
-                            item.put("dexFile", dexName);
-                            results.put(item);
-                        }
-                        break;
-                }
-            }
+        if (session.dexBytes.isEmpty()) {
+            throw new RuntimeException("No DEX data loaded");
         }
         
-        result.put("query", query);
-        result.put("searchType", searchType);
-        result.put("total", results.length());
-        result.put("results", results);
-        
-        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();
         
@@ -1912,11 +1785,9 @@ public class DexManager {
             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");
                 
@@ -1967,23 +1838,9 @@ public class DexManager {
         }
     }
 
-    /**
-     * 获取缓存的 Smali 代码（用于搜索优化）
-     */
-    private String getCachedSmali(MultiDexSession session, String className, DexBackedDexFile dexFile, ClassDef classDef) {
-        // 先查缓存
-        String cached = session.smaliCache.get(className);
-        if (cached != null) {
-            return cached;
-        }
-        // 缓存未命中，反编译并缓存
-        String smali = getSmaliForClass(dexFile, classDef);
-        session.smaliCache.put(className, smali);
-        return smali;
-    }
 
     /**
-     * 从多 DEX 会话获取类的 Smali 代码
+     * 从多 DEX 会话获取类的 Smali 代码（Rust 实现）
      */
     public JSObject getClassSmaliFromSession(String sessionId, String className) throws Exception {
         MultiDexSession session = multiDexSessions.get(sessionId);
@@ -1991,20 +1848,24 @@ public class DexManager {
             throw new IllegalArgumentException("Session not found: " + sessionId);
         }
         
-        String targetType = convertClassNameToType(className);
+        if (!RustDex.isAvailable()) {
+            throw new RuntimeException("Rust DEX library not available");
+        }
         
-        for (Map.Entry<String, DexBackedDexFile> entry : session.dexFiles.entrySet()) {
+        // 使用 Rust 获取 Smali
+        for (Map.Entry<String, byte[]> entry : session.dexBytes.entrySet()) {
             String dexName = entry.getKey();
-            DexBackedDexFile dexFile = entry.getValue();
+            byte[] dexData = entry.getValue();
             
-            for (ClassDef classDef : dexFile.getClasses()) {
-                if (classDef.getType().equals(targetType)) {
-                    JSObject result = new JSObject();
-                    result.put("className", className);
-                    result.put("dexFile", dexName);
-                    result.put("smaliContent", getSmaliForClass(dexFile, classDef));
-                    return result;
-                }
+            String jsonResult = RustDex.getClassSmali(dexData, className);
+            if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                org.json.JSONObject rustResult = new org.json.JSONObject(jsonResult);
+                JSObject result = new JSObject();
+                result.put("className", className);
+                result.put("dexFile", dexName);
+                result.put("smaliContent", rustResult.optString("smaliContent", ""));
+                result.put("engine", "rust");
+                return result;
             }
         }
         
@@ -2012,7 +1873,7 @@ public class DexManager {
     }
 
     /**
-     * 修改类并保存到多 DEX 会话
+     * 修改类并保存到多 DEX 会话（Rust 实现）
      */
     public void modifyClassInSession(String sessionId, String className, String smaliContent) throws Exception {
         MultiDexSession session = multiDexSessions.get(sessionId);
@@ -2020,36 +1881,41 @@ public class DexManager {
             throw new IllegalArgumentException("Session not found: " + sessionId);
         }
         
-        String targetType = convertClassNameToType(className);
+        if (!RustDex.isAvailable()) {
+            throw new RuntimeException("Rust DEX library not available");
+        }
         
         // 找到类所在的 DEX
         String targetDex = null;
-        for (Map.Entry<String, DexBackedDexFile> entry : session.dexFiles.entrySet()) {
-            for (ClassDef classDef : entry.getValue().getClasses()) {
-                if (classDef.getType().equals(targetType)) {
-                    targetDex = entry.getKey();
-                    break;
-                }
+        for (Map.Entry<String, byte[]> entry : session.dexBytes.entrySet()) {
+            String jsonResult = RustDex.getClassSmali(entry.getValue(), className);
+            if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                targetDex = entry.getKey();
+                break;
             }
-            if (targetDex != null) break;
         }
         
         if (targetDex == null) {
             throw new IllegalArgumentException("Class not found: " + className);
         }
         
-        // 编译新的 Smali
-        ClassDef newClassDef = compileSmaliToClass(smaliContent, Opcodes.getDefault());
+        // 使用 Rust 修改类
+        byte[] originalDex = session.dexBytes.get(targetDex);
+        byte[] modifiedDex = RustDex.modifyClass(originalDex, className, smaliContent);
+        
+        if (modifiedDex == null) {
+            throw new RuntimeException("Failed to modify class: " + className);
+        }
         
-        // 记录修改
-        session.modifiedClasses.put(targetDex + "|" + className, newClassDef);
+        // 更新 DEX 字节数据
+        session.dexBytes.put(targetDex, modifiedDex);
         session.modified = true;
         
-        Log.d(TAG, "Modified class in session: " + className);
+        Log.d(TAG, "Modified class in session (Rust): " + className);
     }
 
     /**
-     * 添加新类到会话
+     * 添加新类到会话（Rust 实现）
      */
     public void addClassToSession(String sessionId, String className, String smaliContent) throws Exception {
         MultiDexSession session = multiDexSessions.get(sessionId);
@@ -2057,23 +1923,33 @@ public class DexManager {
             throw new IllegalArgumentException("Session not found: " + sessionId);
         }
         
-        // 编译 Smali
-        ClassDef newClassDef = compileSmaliToClass(smaliContent, Opcodes.getDefault());
+        if (!RustDex.isAvailable()) {
+            throw new RuntimeException("Rust DEX library not available");
+        }
         
         // 添加到第一个 DEX（默认 classes.dex）
         String targetDex = "classes.dex";
-        if (!session.dexFiles.containsKey(targetDex) && !session.dexFiles.isEmpty()) {
-            targetDex = session.dexFiles.keySet().iterator().next();
+        if (!session.dexBytes.containsKey(targetDex) && !session.dexBytes.isEmpty()) {
+            targetDex = session.dexBytes.keySet().iterator().next();
         }
         
-        session.modifiedClasses.put(targetDex + "|" + className, newClassDef);
+        // 使用 Rust 添加类
+        byte[] originalDex = session.dexBytes.get(targetDex);
+        byte[] modifiedDex = RustDex.addClass(originalDex, smaliContent);
+        
+        if (modifiedDex == null) {
+            throw new RuntimeException("Failed to add class: " + className);
+        }
+        
+        // 更新 DEX 字节数据
+        session.dexBytes.put(targetDex, modifiedDex);
         session.modified = true;
         
-        Log.d(TAG, "Added class to session: " + className);
+        Log.d(TAG, "Added class to session (Rust): " + className);
     }
 
     /**
-     * 从会话中删除类
+     * 从会话中删除类（Rust 实现）
      */
     public void deleteClassFromSession(String sessionId, String className) throws Exception {
         MultiDexSession session = multiDexSessions.get(sessionId);
@@ -2081,29 +1957,37 @@ public class DexManager {
             throw new IllegalArgumentException("Session not found: " + sessionId);
         }
         
-        String targetType = convertClassNameToType(className);
+        if (!RustDex.isAvailable()) {
+            throw new RuntimeException("Rust DEX library not available");
+        }
         
-        // 找到类所在的 DEX 并标记为删除
+        // 找到类所在的 DEX
         String targetDex = null;
-        for (Map.Entry<String, DexBackedDexFile> entry : session.dexFiles.entrySet()) {
-            for (ClassDef classDef : entry.getValue().getClasses()) {
-                if (classDef.getType().equals(targetType)) {
-                    targetDex = entry.getKey();
-                    break;
-                }
+        for (Map.Entry<String, byte[]> entry : session.dexBytes.entrySet()) {
+            String jsonResult = RustDex.getClassSmali(entry.getValue(), className);
+            if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                targetDex = entry.getKey();
+                break;
             }
-            if (targetDex != null) break;
         }
         
         if (targetDex == null) {
             throw new IllegalArgumentException("Class not found: " + className);
         }
         
-        // 用 null 标记删除
-        session.modifiedClasses.put(targetDex + "|" + className, null);
+        // 使用 Rust 删除类
+        byte[] originalDex = session.dexBytes.get(targetDex);
+        byte[] modifiedDex = RustDex.deleteClass(originalDex, className);
+        
+        if (modifiedDex == null) {
+            throw new RuntimeException("Failed to delete class: " + className);
+        }
+        
+        // 更新 DEX 字节数据
+        session.dexBytes.put(targetDex, modifiedDex);
         session.modified = true;
         
-        Log.d(TAG, "Deleted class from session: " + className);
+        Log.d(TAG, "Deleted class from session (Rust): " + className);
     }
 
     /**

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

@@ -72,15 +72,37 @@ public class RustDex {
     );
 
     /**
-     * Java 回退实现 - 当 Rust 库不可用时使用
+     * 修改 DEX 中的类
+     * @param dexBytes DEX 文件字节数组
+     * @param className 类名
+     * @param newSmali 新的 Smali 代码
+     * @return 修改后的 DEX 字节数组，失败返回 null
      */
-    public static String searchInDexFallback(
+    public static native byte[] modifyClass(
         byte[] dexBytes,
-        String query,
-        String searchType,
-        boolean caseSensitive,
-        int maxResults
-    ) {
-        return "{\"error\": \"Rust library not available, using Java implementation\", \"fallback\": true}";
-    }
+        String className,
+        String newSmali
+    );
+
+    /**
+     * 添加新类到 DEX
+     * @param dexBytes DEX 文件字节数组
+     * @param newSmali 新类的 Smali 代码
+     * @return 修改后的 DEX 字节数组，失败返回 null
+     */
+    public static native byte[] addClass(
+        byte[] dexBytes,
+        String newSmali
+    );
+
+    /**
+     * 从 DEX 中删除类
+     * @param dexBytes DEX 文件字节数组
+     * @param className 要删除的类名
+     * @return 修改后的 DEX 字节数组，失败返回 null
+     */
+    public static native byte[] deleteClass(
+        byte[] dexBytes,
+        String className
+    );
 }

package/package.json

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