capacitor-dex-editor 0.0.72 → 0.0.74

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;
         
@@ -602,28 +641,39 @@ public class DexManager {
     }
 
     /**
-     * 设置方法的 Smali 代码
+     * 设置方法的 Smali 代码（优先使用 C++ 实现）
      */
     public void setMethodSmali(String sessionId, String className,
                                String methodName, String methodSignature,
                                String smaliCode) throws Exception {
         DexSession session = getSession(sessionId);
+        
+        // 获取原类的 Smali 并替换方法
+        String classSmali = classToSmali(sessionId, className).getString("smali");
+        String modifiedSmali = replaceMethodInSmali(classSmali, methodName, methodSignature, smaliCode);
+        
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                byte[] newDexBytes = CppDex.modifyClass(session.dexBytes, className, modifiedSmali);
+                if (newDexBytes != null) {
+                    session.dexBytes = newDexBytes;
+                    session.modified = true;
+                    Log.d(TAG, "Modified method via C++: " + className + "->" + methodName);
+                    return;
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ modifyClass failed, fallback to Java", e);
+            }
+        }
+        
+        // Java 回退实现
         ClassDef classDef = findClass(session, className);
-
         if (classDef == null) {
             throw new IllegalArgumentException("Class not found: " + className);
         }
-
-        // 获取原类的 Smali
-        String classSmali = classToSmali(sessionId, className).getString("smali");
         
-        // 替换方法
-        String modifiedSmali = replaceMethodInSmali(classSmali, methodName, methodSignature, smaliCode);
-        
-        // 重新编译
         ClassDef modifiedClass = compileSmaliToClass(modifiedSmali, session.originalDexFile.getOpcodes());
-        
-        // 更新会话
         session.removedClasses.add(className);
         session.modifiedClasses.add(modifiedClass);
         session.modified = true;
@@ -894,7 +944,7 @@ public class DexManager {
     }
 
     /**
-     * 汇编 Smali 目录为 DEX
+     * 汇编 Smali 目录为 DEX（优先使用 C++ 实现）
      */
     public JSObject assemble(String smaliDir, String outputPath) throws Exception {
         File inputDir = new File(smaliDir);
@@ -905,7 +955,35 @@ public class DexManager {
         }
 
         outputFile.getParentFile().mkdirs();
+        
+        // 优先使用 C++ 实现
+        if (CppDex.isAvailable()) {
+            try {
+                // 读取所有 smali 文件并合并
+                List<File> smaliFiles = collectSmaliFiles(inputDir);
+                StringBuilder allSmali = new StringBuilder();
+                for (File f : smaliFiles) {
+                    allSmali.append(readFileContent(f));
+                    allSmali.append("\n\n");
+                }
+                
+                byte[] dexBytes = CppDex.smaliToDex(allSmali.toString());
+                if (dexBytes != null && dexBytes.length > 0) {
+                    try (java.io.FileOutputStream fos = new java.io.FileOutputStream(outputFile)) {
+                        fos.write(dexBytes);
+                    }
+                    JSObject result = new JSObject();
+                    result.put("success", true);
+                    result.put("outputPath", outputPath);
+                    result.put("engine", "cpp");
+                    return result;
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ smaliToDex failed, fallback to Java", e);
+            }
+        }
 
+        // Java 回退实现
         SmaliOptions options = new SmaliOptions();
         options.outputDexFile = outputPath;
         
@@ -920,6 +998,7 @@ public class DexManager {
         JSObject result = new JSObject();
         result.put("success", success);
         result.put("outputPath", outputPath);
+        result.put("engine", "java");
         return result;
     }
 

package/package.json

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