capacitor-dex-editor 0.0.65 → 0.0.66

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) {
@@ -1764,8 +1757,7 @@ public class DexManager {
     }
 
     /**
-     * 在多 DEX 会话中搜索
-     * 优先使用 Rust 实现，如果不可用则回退到 Java 实现
+     * 在多 DEX 会话中搜索（Rust 实现）
      */
     public JSObject searchInMultiSession(String sessionId, String query, String searchType, 
                                           boolean caseSensitive, int maxResults) throws Exception {
@@ -1774,137 +1766,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 +1781,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,20 +1834,6 @@ 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 代码

package/package.json

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