capacitor-dex-editor 0.0.55 → 0.0.57

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

@@ -537,6 +537,40 @@ public class DexEditorPluginPlugin extends Plugin {
                 dexManager.closeMultiDexSession(params.getString("sessionId"));
                 break;
 
+            case "addClassToSession":
+                dexManager.addClassToSession(
+                    params.getString("sessionId"),
+                    params.getString("className"),
+                    params.getString("smaliContent")
+                );
+                break;
+
+            case "deleteClassFromSession":
+                dexManager.deleteClassFromSession(
+                    params.getString("sessionId"),
+                    params.getString("className")
+                );
+                break;
+
+            case "getMethodFromSession":
+                result.put("data", dexManager.getMethodFromSession(
+                    params.getString("sessionId"),
+                    params.getString("className"),
+                    params.getString("methodName"),
+                    params.optString("methodSignature", "")
+                ));
+                break;
+
+            case "modifyMethodInSession":
+                dexManager.modifyMethodInSession(
+                    params.getString("sessionId"),
+                    params.getString("className"),
+                    params.getString("methodName"),
+                    params.optString("methodSignature", ""),
+                    params.getString("newMethodCode")
+                );
+                break;
+
             case "listSessions":
                 result.put("data", dexManager.listAllSessions());
                 break;

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

@@ -98,6 +98,30 @@ public class DexManager {
     
     // 存储多 DEX 会话（MCP 工作流）
     private final Map<String, MultiDexSession> multiDexSessions = new HashMap<>();
+    
+    // APK DEX 缓存 - 用于加速编译（key: apkPath + ":" + dexPath）
+    private final Map<String, ApkDexCache> apkDexCaches = new HashMap<>();
+    
+    /**
+     * APK DEX 缓存 - 缓存从 APK 读取的 DEX 数据和 ClassDef
+     */
+    private static class ApkDexCache {
+        String apkPath;
+        String dexPath;
+        long lastModified;
+        Map<String, ClassDef> classDefMap; // type -> ClassDef
+        int dexVersion;
+        
+        ApkDexCache(String apkPath, String dexPath) {
+            this.apkPath = apkPath;
+            this.dexPath = dexPath;
+            this.classDefMap = new HashMap<>();
+        }
+        
+        String getCacheKey() {
+            return apkPath + ":" + dexPath;
+        }
+    }
 
     /**
      * DEX 会话 - 存储加载的 DEX 文件及其修改状态
@@ -1959,6 +1983,194 @@ public class DexManager {
         Log.d(TAG, "Modified class in session: " + className);
     }
 
+    /**
+     * 添加新类到会话
+     */
+    public void addClassToSession(String sessionId, String className, String smaliContent) throws Exception {
+        MultiDexSession session = multiDexSessions.get(sessionId);
+        if (session == null) {
+            throw new IllegalArgumentException("Session not found: " + sessionId);
+        }
+        
+        // 编译 Smali
+        ClassDef newClassDef = compileSmaliToClass(smaliContent, Opcodes.getDefault());
+        
+        // 添加到第一个 DEX（默认 classes.dex）
+        String targetDex = "classes.dex";
+        if (!session.dexFiles.containsKey(targetDex) && !session.dexFiles.isEmpty()) {
+            targetDex = session.dexFiles.keySet().iterator().next();
+        }
+        
+        session.modifiedClasses.put(targetDex + "|" + className, newClassDef);
+        session.modified = true;
+        
+        Log.d(TAG, "Added class to session: " + className);
+    }
+
+    /**
+     * 从会话中删除类
+     */
+    public void deleteClassFromSession(String sessionId, String className) throws Exception {
+        MultiDexSession session = multiDexSessions.get(sessionId);
+        if (session == null) {
+            throw new IllegalArgumentException("Session not found: " + sessionId);
+        }
+        
+        String targetType = convertClassNameToType(className);
+        
+        // 找到类所在的 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;
+                }
+            }
+            if (targetDex != null) break;
+        }
+        
+        if (targetDex == null) {
+            throw new IllegalArgumentException("Class not found: " + className);
+        }
+        
+        // 用 null 标记删除
+        session.modifiedClasses.put(targetDex + "|" + className, null);
+        session.modified = true;
+        
+        Log.d(TAG, "Deleted class from session: " + className);
+    }
+
+    /**
+     * 从会话中获取单个方法的 Smali 代码
+     */
+    public JSObject getMethodFromSession(String sessionId, String className, String methodName, String methodSignature) throws Exception {
+        JSObject result = new JSObject();
+        
+        MultiDexSession session = multiDexSessions.get(sessionId);
+        if (session == null) {
+            throw new IllegalArgumentException("Session not found: " + sessionId);
+        }
+        
+        // 先获取整个类的 Smali
+        JSObject classResult = getClassSmaliFromSession(sessionId, className);
+        String smaliContent = classResult.optString("smaliContent", "");
+        
+        if (smaliContent.isEmpty()) {
+            result.put("methodCode", "# 类未找到: " + className);
+            return result;
+        }
+        
+        // 解析并提取方法
+        String methodCode = extractMethodFromSmali(smaliContent, methodName, methodSignature);
+        result.put("methodCode", methodCode);
+        result.put("className", className);
+        result.put("methodName", methodName);
+        
+        return result;
+    }
+
+    /**
+     * 修改会话中的单个方法
+     */
+    public void modifyMethodInSession(String sessionId, String className, String methodName, String methodSignature, String newMethodCode) throws Exception {
+        MultiDexSession session = multiDexSessions.get(sessionId);
+        if (session == null) {
+            throw new IllegalArgumentException("Session not found: " + sessionId);
+        }
+        
+        // 获取整个类的 Smali
+        JSObject classResult = getClassSmaliFromSession(sessionId, className);
+        String smaliContent = classResult.optString("smaliContent", "");
+        
+        if (smaliContent.isEmpty()) {
+            throw new IllegalArgumentException("Class not found: " + className);
+        }
+        
+        // 替换方法
+        String newSmaliContent = replaceMethodInSmali(smaliContent, methodName, methodSignature, newMethodCode);
+        
+        // 保存修改后的类
+        modifyClassInSession(sessionId, className, newSmaliContent);
+        
+        Log.d(TAG, "Modified method in session: " + className + "." + methodName);
+    }
+
+    /**
+     * 从 Smali 代码中提取指定方法
+     */
+    private String extractMethodFromSmali(String smaliContent, String methodName, String methodSignature) {
+        String[] lines = smaliContent.split("\n");
+        StringBuilder methodCode = new StringBuilder();
+        boolean inMethod = false;
+        boolean found = false;
+        
+        for (String line : lines) {
+            if (line.startsWith(".method ")) {
+                // 检查是否是目标方法
+                if (line.contains(" " + methodName + "(") || line.contains(" " + methodName + ";")) {
+                    // 如果指定了签名，进一步匹配
+                    if (methodSignature == null || methodSignature.isEmpty() || line.contains(methodSignature)) {
+                        inMethod = true;
+                        found = true;
+                    }
+                }
+            }
+            
+            if (inMethod) {
+                methodCode.append(line).append("\n");
+                if (line.equals(".end method")) {
+                    break;
+                }
+            }
+        }
+        
+        if (!found) {
+            return "# 方法未找到: " + methodName + (methodSignature != null ? methodSignature : "");
+        }
+        
+        return methodCode.toString();
+    }
+
+    /**
+     * 替换 Smali 代码中的指定方法
+     */
+    private String replaceMethodInSmali(String smaliContent, String methodName, String methodSignature, String newMethodCode) {
+        String[] lines = smaliContent.split("\n");
+        StringBuilder result = new StringBuilder();
+        boolean inMethod = false;
+        boolean replaced = false;
+        
+        for (String line : lines) {
+            if (line.startsWith(".method ")) {
+                if (line.contains(" " + methodName + "(") || line.contains(" " + methodName + ";")) {
+                    if (methodSignature == null || methodSignature.isEmpty() || line.contains(methodSignature)) {
+                        // 插入新方法代码
+                        result.append(newMethodCode.trim()).append("\n");
+                        inMethod = true;
+                        replaced = true;
+                        continue;
+                    }
+                }
+            }
+            
+            if (inMethod) {
+                if (line.equals(".end method")) {
+                    inMethod = false;
+                }
+                continue;
+            }
+            
+            result.append(line).append("\n");
+        }
+        
+        if (!replaced) {
+            throw new IllegalArgumentException("Method not found: " + methodName);
+        }
+        
+        return result.toString();
+    }
+
     /**
      * 保存多 DEX 会话的修改到 APK
      */
@@ -2119,27 +2331,28 @@ public class DexManager {
     }
 
     /**
-     * 从 APK 中的 DEX 文件获取类的 Smali 代码
+     * 获取或创建 APK DEX 缓存
      */
-    public JSObject getClassSmaliFromApk(String apkPath, String dexPath, String className) throws Exception {
-        JSObject result = new JSObject();
-        StringBuilder smali = new StringBuilder();
+    private ApkDexCache getOrCreateDexCache(String apkPath, String dexPath) throws Exception {
+        String cacheKey = apkPath + ":" + dexPath;
+        java.io.File apkFile = new java.io.File(apkPath);
+        long currentModified = apkFile.lastModified();
         
-        Log.d(TAG, "getClassSmaliFromApk: apkPath=" + apkPath + ", dexPath=" + dexPath + ", className=" + className);
+        ApkDexCache cache = apkDexCaches.get(cacheKey);
         
-        if (className == null || className.isEmpty()) {
-            result.put("smali", "# 未指定类名");
-            return result;
+        // 检查缓存是否有效
+        if (cache != null && cache.lastModified == currentModified && !cache.classDefMap.isEmpty()) {
+            Log.d(TAG, "Using DEX cache for: " + cacheKey + " (" + cache.classDefMap.size() + " classes)");
+            return cache;
         }
         
-        String targetType = convertClassNameToType(className);
-        
-        java.util.zip.ZipFile zipFile = null;
-        java.io.InputStream dexInputStream = null;
+        // 需要重新加载
+        Log.d(TAG, "Loading DEX into cache: " + cacheKey);
+        cache = new ApkDexCache(apkPath, dexPath);
+        cache.lastModified = currentModified;
         
+        java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(apkPath);
         try {
-            zipFile = new java.util.zip.ZipFile(apkPath);
-            
             // 尝试多种可能的 dexPath 格式
             java.util.zip.ZipEntry dexEntry = zipFile.getEntry(dexPath);
             if (dexEntry == null) {
@@ -2154,33 +2367,70 @@ public class DexManager {
             }
             
             if (dexEntry == null) {
-                result.put("smali", "# DEX 文件未找到: " + dexPath);
-                return result;
+                throw new Exception("DEX 文件未找到: " + dexPath);
             }
             
-            dexInputStream = zipFile.getInputStream(dexEntry);
-            
-            // 读取 DEX 文件到内存
+            // 读取 DEX 文件
+            java.io.InputStream dexInputStream = zipFile.getInputStream(dexEntry);
             java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
-            byte[] buffer = new byte[8192];
+            byte[] buffer = new byte[16384];
             int len;
             while ((len = dexInputStream.read(buffer)) != -1) {
                 baos.write(buffer, 0, len);
             }
+            dexInputStream.close();
             byte[] dexBytes = baos.toByteArray();
             
-            // 解析 DEX 文件
+            // 解析 DEX 文件并缓存所有 ClassDef
             DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexBytes);
+            cache.dexVersion = 35; // 默认 DEX 版本
             
-            // 查找目标类
-            ClassDef targetClass = null;
             for (ClassDef classDef : dexFile.getClasses()) {
-                if (classDef.getType().equals(targetType)) {
-                    targetClass = classDef;
-                    break;
-                }
+                cache.classDefMap.put(classDef.getType(), classDef);
             }
             
+            Log.d(TAG, "Cached " + cache.classDefMap.size() + " classes from " + dexPath);
+        } finally {
+            zipFile.close();
+        }
+        
+        apkDexCaches.put(cacheKey, cache);
+        return cache;
+    }
+    
+    /**
+     * 清除指定 APK 的 DEX 缓存
+     */
+    public void clearDexCache(String apkPath) {
+        java.util.Iterator<String> it = apkDexCaches.keySet().iterator();
+        while (it.hasNext()) {
+            if (it.next().startsWith(apkPath + ":")) {
+                it.remove();
+            }
+        }
+        Log.d(TAG, "Cleared DEX cache for: " + apkPath);
+    }
+    
+    /**
+     * 从 APK 中的 DEX 文件获取类的 Smali 代码（使用缓存）
+     */
+    public JSObject getClassSmaliFromApk(String apkPath, String dexPath, String className) throws Exception {
+        JSObject result = new JSObject();
+        
+        Log.d(TAG, "getClassSmaliFromApk: apkPath=" + apkPath + ", dexPath=" + dexPath + ", className=" + className);
+        
+        if (className == null || className.isEmpty()) {
+            result.put("smali", "# 未指定类名");
+            return result;
+        }
+        
+        String targetType = convertClassNameToType(className);
+        
+        try {
+            // 使用缓存获取 ClassDef
+            ApkDexCache cache = getOrCreateDexCache(apkPath, dexPath);
+            ClassDef targetClass = cache.classDefMap.get(targetType);
+            
             if (targetClass == null) {
                 result.put("smali", "# 类未找到: " + className + "\n# 目标类型: " + targetType);
                 return result;
@@ -2197,13 +2447,8 @@ public class DexManager {
             
             result.put("smali", stringWriter.toString());
             
-        } finally {
-            if (dexInputStream != null) {
-                try { dexInputStream.close(); } catch (Exception ignored) {}
-            }
-            if (zipFile != null) {
-                try { zipFile.close(); } catch (Exception ignored) {}
-            }
+        } catch (Exception e) {
+            result.put("smali", "# 加载失败: " + e.getMessage());
         }
         
         return result;
@@ -2250,72 +2495,42 @@ public class DexManager {
                 return result;
             }
             
-            reportProgress(30, 100);
+            reportProgress(20, 100);
             Log.d(TAG, "Smali compiled successfully to ClassDef");
             
-            // 读取原 APK 中的 DEX 文件
+            // 使用缓存获取 ClassDef（核心优化）
             reportTitle("合并 DEX");
-            reportMessage("读取原 DEX...");
-            
-            java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(apkPath);
-            java.util.zip.ZipEntry dexEntry = zipFile.getEntry(dexPath);
-            
-            if (dexEntry == null) {
-                result.put("success", false);
-                result.put("error", "DEX 文件未找到: " + dexPath);
-                zipFile.close();
-                return result;
-            }
-            
-            // 读取原 DEX
-            java.io.InputStream dexInputStream = zipFile.getInputStream(dexEntry);
-            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
-            byte[] buffer = new byte[16384];
-            int len;
-            while ((len = dexInputStream.read(buffer)) != -1) {
-                baos.write(buffer, 0, len);
-            }
-            byte[] originalDexBytes = baos.toByteArray();
-            dexInputStream.close();
-            
-            // 解析原 DEX
-            DexBackedDexFile originalDex = new DexBackedDexFile(Opcodes.getDefault(), originalDexBytes);
-            
-            reportMessage("收集类定义...");
-            reportProgress(40, 100);
+            reportMessage("获取缓存...");
             
             String targetType = "L" + className.replace(".", "/") + ";";
-            java.util.List<ClassDef> mergedClasses = new java.util.ArrayList<>();
+            ApkDexCache cache = getOrCreateDexCache(apkPath, dexPath);
             
-            // 添加原 DEX 中除目标类外的所有类
-            for (ClassDef classDef : originalDex.getClasses()) {
-                if (!classDef.getType().equals(targetType)) {
-                    mergedClasses.add(classDef);
-                }
-            }
+            reportProgress(30, 100);
+            reportMessage("更新缓存...");
             
-            // 添加新编译的类
-            mergedClasses.add(newClassDef);
+            // 更新缓存中的 ClassDef
+            cache.classDefMap.put(targetType, newClassDef);
             
-            Log.d(TAG, "Merged " + mergedClasses.size() + " classes");
+            Log.d(TAG, "Using cached " + cache.classDefMap.size() + " classes");
             
-            // 创建新的 DEX 文件（使用内存）
-            reportMessage("写入 DEX (" + mergedClasses.size() + " 个类)...");
-            reportProgress(50, 100);
+            // 创建新的 DEX 文件（使用缓存的 ClassDef）
+            reportMessage("写入 DEX (" + cache.classDefMap.size() + " 个类)...");
+            reportProgress(40, 100);
             
             DexPool dexPool = new DexPool(Opcodes.getDefault());
-            int totalClasses = mergedClasses.size();
+            int totalClasses = cache.classDefMap.size();
             int currentClass = 0;
-            for (ClassDef classDef : mergedClasses) {
+            for (ClassDef classDef : cache.classDefMap.values()) {
                 dexPool.internClass(classDef);
                 currentClass++;
-                if (currentClass % 100 == 0 || currentClass == totalClasses) {
-                    reportProgress(50 + (currentClass * 30 / totalClasses), 100);
+                if (currentClass % 200 == 0 || currentClass == totalClasses) {
+                    reportProgress(40 + (currentClass * 40 / totalClasses), 100);
                 }
             }
             
             // 使用内存写入 DEX（避免临时文件）
             reportProgress(80, 100);
+            reportMessage("生成 DEX...");
             com.android.tools.smali.dexlib2.writer.io.MemoryDataStore memoryStore = 
                 new com.android.tools.smali.dexlib2.writer.io.MemoryDataStore();
             dexPool.writeTo(memoryStore);
@@ -2323,8 +2538,6 @@ public class DexManager {
             
             Log.d(TAG, "Merged DEX size: " + newDexBytes.length + " bytes");
             
-            zipFile.close();
-            
             // MT 风格：直接替换 APK 内的 DEX
             reportTitle("更新 APK");
             reportMessage("正在替换 DEX...");
@@ -2389,6 +2602,9 @@ public class DexManager {
             Log.d(TAG, "APK updated successfully: " + apkPath);
             reportProgress(100, 100);
             
+            // 更新缓存的 lastModified 以匹配新的 APK
+            cache.lastModified = new java.io.File(apkPath).lastModified();
+            
             result.put("success", true);
             result.put("message", "Smali 编译成功！APK 已更新");
             result.put("apkPath", apkPath);

package/package.json

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