capacitor-dex-editor 0.0.71 → 0.0.73

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

@@ -307,6 +307,31 @@ public class DexEditorPluginPlugin extends Plugin {
                 ));
                 break;
 
+            // ============ 交叉引用分析（C++ 实现）============
+            case "findMethodXrefs":
+                result.put("data", dexManager.findMethodXrefs(
+                    params.getString("sessionId"),
+                    params.getString("className"),
+                    params.getString("methodName")
+                ));
+                break;
+
+            case "findFieldXrefs":
+                result.put("data", dexManager.findFieldXrefs(
+                    params.getString("sessionId"),
+                    params.getString("className"),
+                    params.getString("fieldName")
+                ));
+                break;
+
+            // ============ Smali 转 Java（C++ 实现）============
+            case "smaliToJava":
+                result.put("data", dexManager.smaliToJava(
+                    params.getString("sessionId"),
+                    params.getString("className")
+                ));
+                break;
+
             // ============ 工具操作 ============
             case "fixDex":
                 dexManager.fixDex(

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

@@ -213,15 +213,29 @@ public class DexManager {
     }
 
     /**
-     * 保存 DEX 文件
+     * 保存 DEX 文件（优先使用 C++ 修改的字节数据）
      */
     public void saveDex(String sessionId, String outputPath) throws Exception {
         DexSession session = getSession(sessionId);
+        
+        File outputFile = new File(outputPath);
+        if (outputFile.getParentFile() != null) {
+            outputFile.getParentFile().mkdirs();
+        }
 
-        // 创建新的 DEX 文件
+        // 如果使用 C++ 修改了 dexBytes，直接保存
+        if (session.dexBytes != null && session.modified && 
+            session.modifiedClasses.isEmpty() && session.removedClasses.isEmpty()) {
+            try (java.io.FileOutputStream fos = new java.io.FileOutputStream(outputFile)) {
+                fos.write(session.dexBytes);
+            }
+            Log.d(TAG, "Saved DEX (C++ modified) to: " + outputPath);
+            return;
+        }
+
+        // Java 回退实现
         DexPool dexPool = new DexPool(session.originalDexFile.getOpcodes());
 
-        // 添加所有类（排除已删除的，使用修改后的版本）
         Set<String> modifiedClassTypes = new HashSet<>();
         for (ClassDef modifiedClass : session.modifiedClasses) {
             modifiedClassTypes.add(modifiedClass.getType());
@@ -235,13 +249,6 @@ public class DexManager {
             }
         }
 
-        // 写入文件 (使用官方推荐方式)
-        File outputFile = new File(outputPath);
-        if (outputFile.getParentFile() != null) {
-            outputFile.getParentFile().mkdirs();
-        }
-        
-        // 创建临时 DexFile 用于写入
         List<ClassDef> allClasses = new ArrayList<>();
         for (ClassDef c : session.modifiedClasses) {
             allClasses.add(c);
@@ -404,12 +411,27 @@ public class DexManager {
     }
 
     /**
-     * 添加类
+     * 添加类（优先使用 C++ 实现）
      */
     public void addClass(String sessionId, String smaliCode) throws Exception {
         DexSession session = getSession(sessionId);
         
-        // 将 Smali 代码编译为 ClassDef
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                byte[] newDexBytes = CppDex.addClass(session.dexBytes, smaliCode);
+                if (newDexBytes != null) {
+                    session.dexBytes = newDexBytes;
+                    session.modified = true;
+                    Log.d(TAG, "Added class via C++");
+                    return;
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ addClass failed, fallback to Java", e);
+            }
+        }
+        
+        // Java 回退实现
         ClassDef newClass = compileSmaliToClass(smaliCode, session.originalDexFile.getOpcodes());
         session.modifiedClasses.add(newClass);
         session.modified = true;
@@ -418,10 +440,27 @@ public class DexManager {
     }
 
     /**
-     * 删除类
+     * 删除类（优先使用 C++ 实现）
      */
     public void removeClass(String sessionId, String className) throws Exception {
         DexSession session = getSession(sessionId);
+        
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                byte[] newDexBytes = CppDex.deleteClass(session.dexBytes, className);
+                if (newDexBytes != null) {
+                    session.dexBytes = newDexBytes;
+                    session.modified = true;
+                    Log.d(TAG, "Removed class via C++: " + className);
+                    return;
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ removeClass failed, fallback to Java", e);
+            }
+        }
+        
+        // Java 回退实现
         session.removedClasses.add(className);
         session.modified = true;
         
@@ -562,21 +601,42 @@ public class DexManager {
     }
 
     /**
-     * 获取方法的 Smali 代码
+     * 获取方法的 Smali 代码（优先使用 C++ 实现）
      */
     public JSObject getMethodSmali(String sessionId, String className,
                                     String methodName, String methodSignature) throws Exception {
         DexSession session = getSession(sessionId);
         
-        // 获取类的完整 Smali，然后提取方法部分
-        String classSmali = classToSmali(sessionId, className).getString("smali");
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                String jsonResult = CppDex.getMethodSmali(session.dexBytes, className, methodName, methodSignature);
+                if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                    org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+                    String smali = cppResult.optString("smali", "");
+                    if (!smali.isEmpty()) {
+                        JSObject result = new JSObject();
+                        result.put("className", className);
+                        result.put("methodName", methodName);
+                        result.put("methodSignature", methodSignature);
+                        result.put("smali", smali);
+                        result.put("engine", "cpp");
+                        return result;
+                    }
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ getMethodSmali failed, fallback to Java", e);
+            }
+        }
         
-        // 简化处理：返回整个类的 Smali（实际应该解析提取特定方法）
+        // Java 回退实现
+        String classSmali = classToSmali(sessionId, className).getString("smali");
         JSObject result = new JSObject();
         result.put("className", className);
         result.put("methodName", methodName);
         result.put("methodSignature", methodSignature);
         result.put("smali", extractMethodSmali(classSmali, methodName, methodSignature));
+        result.put("engine", "java");
         return result;
     }
 
@@ -782,21 +842,40 @@ public class DexManager {
     // ==================== Smali 操作 ====================
 
     /**
-     * 将类转换为 Smali 代码
+     * 将类转换为 Smali 代码（优先使用 C++ 实现）
      */
     public JSObject classToSmali(String sessionId, String className) throws Exception {
         DexSession session = getSession(sessionId);
+        
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                String jsonResult = CppDex.getClassSmali(session.dexBytes, className);
+                if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                    org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+                    String smali = cppResult.optString("smali", "");
+                    if (!smali.isEmpty()) {
+                        JSObject result = new JSObject();
+                        result.put("className", className);
+                        result.put("smali", smali);
+                        result.put("engine", "cpp");
+                        return result;
+                    }
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ classToSmali failed, fallback to Java", e);
+            }
+        }
+        
+        // Java 回退实现
         ClassDef classDef = findClass(session, className);
-
         if (classDef == null) {
             throw new IllegalArgumentException("Class not found: " + className);
         }
 
-        // 使用 baksmali 转换
         StringWriter writer = new StringWriter();
         BaksmaliOptions options = new BaksmaliOptions();
         
-        // 创建临时 DEX 只包含该类
         List<ClassDef> singleClass = new ArrayList<>();
         singleClass.add(classDef);
         ImmutableDexFile singleDex = new ImmutableDexFile(
@@ -804,7 +883,6 @@ public class DexManager {
             singleClass
         );
 
-        // 使用临时目录输出
         File tempDir = File.createTempFile("smali_", "_temp");
         tempDir.delete();
         tempDir.mkdirs();
@@ -812,7 +890,6 @@ public class DexManager {
         try {
             Baksmali.disassembleDexFile(singleDex, tempDir, 1, options);
             
-            // 读取生成的 smali 文件
             String smaliPath = className.substring(1, className.length() - 1) + ".smali";
             File smaliFile = new File(tempDir, smaliPath);
             
@@ -821,6 +898,7 @@ public class DexManager {
                 JSObject result = new JSObject();
                 result.put("className", className);
                 result.put("smali", smali);
+                result.put("engine", "java");
                 return result;
             } else {
                 throw new IOException("Failed to generate smali for: " + className);
@@ -887,30 +965,51 @@ public class DexManager {
     // ==================== 搜索操作 ====================
 
     /**
-     * 搜索字符串
+     * 搜索字符串（优先使用 C++ 实现）
      */
     public JSArray searchString(String sessionId, String query, 
                                 boolean regex, boolean caseSensitive) throws Exception {
         DexSession session = getSession(sessionId);
+        
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null && !regex) {
+            try {
+                String jsonResult = CppDex.searchInDex(session.dexBytes, query, "string", caseSensitive, 1000);
+                if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                    org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+                    org.json.JSONArray cppResults = cppResult.optJSONArray("results");
+                    if (cppResults != null) {
+                        JSArray results = new JSArray();
+                        for (int i = 0; i < cppResults.length(); i++) {
+                            org.json.JSONObject r = cppResults.getJSONObject(i);
+                            JSObject item = new JSObject();
+                            item.put("value", r.optString("value"));
+                            item.put("index", r.optInt("index"));
+                            results.put(item);
+                        }
+                        return results;
+                    }
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ searchString failed, fallback to Java", e);
+            }
+        }
+        
+        // Java 回退实现
         JSArray results = new JSArray();
-
         Pattern pattern = null;
         if (regex) {
             int flags = caseSensitive ? 0 : Pattern.CASE_INSENSITIVE;
             pattern = Pattern.compile(query, flags);
         }
 
-        // 遍历所有类中的字符串引用进行搜索
         Set<String> searchedStrings = new HashSet<>();
         for (ClassDef classDef : session.originalDexFile.getClasses()) {
-            // 类名
             checkAndAddString(classDef.getType(), query, regex, caseSensitive, pattern, searchedStrings, results);
-            // 父类
             if (classDef.getSuperclass() != null) {
                 checkAndAddString(classDef.getSuperclass(), query, regex, caseSensitive, pattern, searchedStrings, results);
             }
         }
-
         return results;
     }
 
@@ -945,16 +1044,41 @@ public class DexManager {
     }
 
     /**
-     * 搜索方法
+     * 搜索方法（优先使用 C++ 实现）
      */
     public JSArray searchMethod(String sessionId, String query) throws Exception {
         DexSession session = getSession(sessionId);
+        
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                String jsonResult = CppDex.searchInDex(session.dexBytes, query, "method", false, 1000);
+                if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                    org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+                    org.json.JSONArray cppResults = cppResult.optJSONArray("results");
+                    if (cppResults != null) {
+                        JSArray results = new JSArray();
+                        for (int i = 0; i < cppResults.length(); i++) {
+                            org.json.JSONObject r = cppResults.getJSONObject(i);
+                            JSObject item = new JSObject();
+                            item.put("className", r.optString("className"));
+                            item.put("methodName", r.optString("name"));
+                            item.put("returnType", r.optString("returnType", ""));
+                            results.put(item);
+                        }
+                        return results;
+                    }
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ searchMethod failed, fallback to Java", e);
+            }
+        }
+        
+        // Java 回退实现
         JSArray results = new JSArray();
         String queryLower = query.toLowerCase();
-
         for (ClassDef classDef : session.originalDexFile.getClasses()) {
             if (session.removedClasses.contains(classDef.getType())) continue;
-
             for (Method method : classDef.getMethods()) {
                 if (method.getName().toLowerCase().contains(queryLower)) {
                     JSObject item = new JSObject();
@@ -965,21 +1089,45 @@ public class DexManager {
                 }
             }
         }
-
         return results;
     }
 
     /**
-     * 搜索字段
+     * 搜索字段（优先使用 C++ 实现）
      */
     public JSArray searchField(String sessionId, String query) throws Exception {
         DexSession session = getSession(sessionId);
+        
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                String jsonResult = CppDex.searchInDex(session.dexBytes, query, "field", false, 1000);
+                if (jsonResult != null && !jsonResult.contains("\"error\"")) {
+                    org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+                    org.json.JSONArray cppResults = cppResult.optJSONArray("results");
+                    if (cppResults != null) {
+                        JSArray results = new JSArray();
+                        for (int i = 0; i < cppResults.length(); i++) {
+                            org.json.JSONObject r = cppResults.getJSONObject(i);
+                            JSObject item = new JSObject();
+                            item.put("className", r.optString("className"));
+                            item.put("fieldName", r.optString("name"));
+                            item.put("fieldType", r.optString("type", ""));
+                            results.put(item);
+                        }
+                        return results;
+                    }
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ searchField failed, fallback to Java", e);
+            }
+        }
+        
+        // Java 回退实现
         JSArray results = new JSArray();
         String queryLower = query.toLowerCase();
-
         for (ClassDef classDef : session.originalDexFile.getClasses()) {
             if (session.removedClasses.contains(classDef.getType())) continue;
-
             for (Field field : classDef.getFields()) {
                 if (field.getName().toLowerCase().contains(queryLower)) {
                     JSObject item = new JSObject();
@@ -990,10 +1138,109 @@ public class DexManager {
                 }
             }
         }
-
         return results;
     }
 
+    // ==================== 交叉引用分析（C++ 实现）====================
+
+    /**
+     * 查找方法的交叉引用
+     */
+    public JSObject findMethodXrefs(String sessionId, String className, String methodName) throws Exception {
+        DexSession session = getSession(sessionId);
+        
+        if (!CppDex.isAvailable() || session.dexBytes == null) {
+            throw new UnsupportedOperationException("C++ library not available for xref analysis");
+        }
+        
+        String jsonResult = CppDex.findMethodXrefs(session.dexBytes, className, methodName);
+        if (jsonResult == null || jsonResult.contains("\"error\"")) {
+            throw new Exception("Failed to find method xrefs");
+        }
+        
+        org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+        JSObject result = new JSObject();
+        result.put("className", className);
+        result.put("methodName", methodName);
+        
+        org.json.JSONArray xrefs = cppResult.optJSONArray("xrefs");
+        JSArray xrefArray = new JSArray();
+        if (xrefs != null) {
+            for (int i = 0; i < xrefs.length(); i++) {
+                org.json.JSONObject x = xrefs.getJSONObject(i);
+                JSObject xref = new JSObject();
+                xref.put("callerClass", x.optString("callerClass"));
+                xref.put("callerMethod", x.optString("callerMethod"));
+                xref.put("offset", x.optInt("offset"));
+                xrefArray.put(xref);
+            }
+        }
+        result.put("xrefs", xrefArray);
+        result.put("count", xrefArray.length());
+        return result;
+    }
+
+    /**
+     * 查找字段的交叉引用
+     */
+    public JSObject findFieldXrefs(String sessionId, String className, String fieldName) throws Exception {
+        DexSession session = getSession(sessionId);
+        
+        if (!CppDex.isAvailable() || session.dexBytes == null) {
+            throw new UnsupportedOperationException("C++ library not available for xref analysis");
+        }
+        
+        String jsonResult = CppDex.findFieldXrefs(session.dexBytes, className, fieldName);
+        if (jsonResult == null || jsonResult.contains("\"error\"")) {
+            throw new Exception("Failed to find field xrefs");
+        }
+        
+        org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+        JSObject result = new JSObject();
+        result.put("className", className);
+        result.put("fieldName", fieldName);
+        
+        org.json.JSONArray xrefs = cppResult.optJSONArray("xrefs");
+        JSArray xrefArray = new JSArray();
+        if (xrefs != null) {
+            for (int i = 0; i < xrefs.length(); i++) {
+                org.json.JSONObject x = xrefs.getJSONObject(i);
+                JSObject xref = new JSObject();
+                xref.put("accessorClass", x.optString("accessorClass"));
+                xref.put("accessorMethod", x.optString("accessorMethod"));
+                xref.put("accessType", x.optString("accessType"));
+                xrefArray.put(xref);
+            }
+        }
+        result.put("xrefs", xrefArray);
+        result.put("count", xrefArray.length());
+        return result;
+    }
+
+    // ==================== Smali 转 Java（C++ 实现）====================
+
+    /**
+     * 将 Smali 代码转换为 Java 伪代码
+     */
+    public JSObject smaliToJava(String sessionId, String className) throws Exception {
+        DexSession session = getSession(sessionId);
+        
+        if (!CppDex.isAvailable() || session.dexBytes == null) {
+            throw new UnsupportedOperationException("C++ library not available for smali to java conversion");
+        }
+        
+        String jsonResult = CppDex.smaliToJava(session.dexBytes, className);
+        if (jsonResult == null || jsonResult.contains("\"error\"")) {
+            throw new Exception("Failed to convert smali to java");
+        }
+        
+        org.json.JSONObject cppResult = new org.json.JSONObject(jsonResult);
+        JSObject result = new JSObject();
+        result.put("className", className);
+        result.put("java", cppResult.optString("java", ""));
+        return result;
+    }
+
     // ==================== 工具操作 ====================
 
     /**

package/package.json

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