capacitor-dex-editor 0.0.56 → 0.0.58

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

@@ -1158,30 +1158,6 @@ public class DexManager {
         return "";
     }
 
-    private String replaceMethodInSmali(String classSmali, String methodName, 
-                                         String signature, String newMethodCode) {
-        String methodStart = ".method";
-        String methodEnd = ".end method";
-        
-        int searchStart = 0;
-        while (true) {
-            int start = classSmali.indexOf(methodStart, searchStart);
-            if (start == -1) break;
-            
-            int end = classSmali.indexOf(methodEnd, start);
-            if (end == -1) break;
-            
-            String methodBlock = classSmali.substring(start, end + methodEnd.length());
-            if (methodBlock.contains(methodName)) {
-                return classSmali.substring(0, start) + newMethodCode + 
-                       classSmali.substring(end + methodEnd.length());
-            }
-            
-            searchStart = end + methodEnd.length();
-        }
-        
-        return classSmali;
-    }
 
     private String insertMethodToSmali(String classSmali, String methodCode) {
         // 在类结束前插入方法
@@ -1983,6 +1959,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
      */

package/package.json

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