capacitor-dex-editor 0.0.76 → 0.0.78

package/android/build.gradle

@@ -77,9 +77,9 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     
     // dexlib2 & smali - DEX文件编辑核心库 (使用 api 暴露给主项目)
+    // baksmali 已移除 - 使用 C++ 实现
     api 'com.android.tools.smali:smali-dexlib2:3.0.3'
     api 'com.android.tools.smali:smali:3.0.3'
-    api 'com.android.tools.smali:smali-baksmali:3.0.3'
     
     // Guava - dexlib2 依赖
     api 'com.google.guava:guava:32.1.3-android'

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

@@ -27,10 +27,6 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableField;
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod;
 import com.android.tools.smali.dexlib2.writer.io.FileDataStore;
 import com.android.tools.smali.dexlib2.writer.pool.DexPool;
-import com.android.tools.smali.baksmali.Baksmali;
-import com.android.tools.smali.baksmali.BaksmaliOptions;
-import com.android.tools.smali.baksmali.Adaptors.ClassDefinition;
-import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
 import com.android.tools.smali.smali.Smali;
 import com.android.tools.smali.smali.SmaliOptions;
 
@@ -111,6 +107,7 @@ public class DexManager {
         long lastModified;
         Map<String, ClassDef> classDefMap; // type -> ClassDef
         int dexVersion;
+        byte[] dexBytes; // DEX 原始字节用于 C++ 操作
         
         ApkDexCache(String apkPath, String dexPath) {
             this.apkPath = apkPath;
@@ -882,49 +879,12 @@ public class DexManager {
                     }
                 }
             } catch (Exception e) {
-                Log.w(TAG, "C++ classToSmali failed, fallback to Java", e);
+                Log.w(TAG, "C++ classToSmali failed", e);
+                throw new Exception("C++ classToSmali failed: " + e.getMessage());
             }
         }
         
-        // Java 回退实现
-        ClassDef classDef = findClass(session, className);
-        if (classDef == null) {
-            throw new IllegalArgumentException("Class not found: " + className);
-        }
-
-        StringWriter writer = new StringWriter();
-        BaksmaliOptions options = new BaksmaliOptions();
-        
-        List<ClassDef> singleClass = new ArrayList<>();
-        singleClass.add(classDef);
-        ImmutableDexFile singleDex = new ImmutableDexFile(
-            session.originalDexFile.getOpcodes(), 
-            singleClass
-        );
-
-        File tempDir = File.createTempFile("smali_", "_temp");
-        tempDir.delete();
-        tempDir.mkdirs();
-
-        try {
-            Baksmali.disassembleDexFile(singleDex, tempDir, 1, options);
-            
-            String smaliPath = className.substring(1, className.length() - 1) + ".smali";
-            File smaliFile = new File(tempDir, smaliPath);
-            
-            if (smaliFile.exists()) {
-                String smali = readFileContent(smaliFile);
-                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);
-            }
-        } finally {
-            deleteRecursive(tempDir);
-        }
+        throw new UnsupportedOperationException("C++ library not available for classToSmali");
     }
 
     /**
@@ -938,17 +898,52 @@ public class DexManager {
     }
 
     /**
-     * 反汇编整个 DEX 到目录
+     * 反汇编整个 DEX 到目录（优先使用 C++ 实现）
      */
     public void disassemble(String sessionId, String outputDir) throws Exception {
         DexSession session = getSession(sessionId);
         File outDir = new File(outputDir);
         outDir.mkdirs();
 
-        BaksmaliOptions options = new BaksmaliOptions();
-        Baksmali.disassembleDexFile(session.originalDexFile, outDir, 4, options);
-        
-        Log.d(TAG, "Disassembled to: " + outputDir);
+        // 优先使用 C++ 实现 - 逐个类反汇编
+        if (CppDex.isAvailable() && session.dexBytes != null) {
+            try {
+                // 获取所有类
+                String classesJson = CppDex.listClasses(session.dexBytes, "", 0, 10000);
+                if (classesJson != null && !classesJson.contains("\"error\"")) {
+                    org.json.JSONObject result = new org.json.JSONObject(classesJson);
+                    org.json.JSONArray classes = result.optJSONArray("classes");
+                    if (classes != null) {
+                        for (int i = 0; i < classes.length(); i++) {
+                            String className = classes.getString(i);
+                            try {
+                                String smaliJson = CppDex.getClassSmali(session.dexBytes, className);
+                                if (smaliJson != null && !smaliJson.contains("\"error\"")) {
+                                    org.json.JSONObject smaliResult = new org.json.JSONObject(smaliJson);
+                                    String smali = smaliResult.optString("smali", "");
+                                    if (!smali.isEmpty()) {
+                                        // 保存到文件
+                                        String filePath = className.substring(1, className.length() - 1) + ".smali";
+                                        File smaliFile = new File(outDir, filePath);
+                                        smaliFile.getParentFile().mkdirs();
+                                        writeFileContent(smaliFile, smali);
+                                    }
+                                }
+                            } catch (Exception e) {
+                                Log.w(TAG, "Failed to disassemble class: " + className, e);
+                            }
+                        }
+                        Log.d(TAG, "Disassembled to (C++): " + outputDir);
+                        return;
+                    }
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "C++ disassemble failed", e);
+                throw new Exception("C++ disassemble failed: " + e.getMessage());
+            }
+        }
+
+        throw new UnsupportedOperationException("C++ library not available for disassemble");
     }
 
     /**
@@ -1652,6 +1647,12 @@ public class DexManager {
         return content.toString();
     }
 
+    private void writeFileContent(File file, String content) throws IOException {
+        try (java.io.BufferedWriter writer = new java.io.BufferedWriter(new java.io.FileWriter(file))) {
+            writer.write(content);
+        }
+    }
+
     private byte[] readFileBytes(File file) throws IOException {
         byte[] bytes = new byte[(int) file.length()];
         try (FileInputStream fis = new FileInputStream(file)) {
@@ -2228,20 +2229,11 @@ public class DexManager {
     }
 
     /**
-     * 获取类的 Smali 代码（内部方法）
+     * 获取类的 Smali 代码（内部方法）- 使用 C++ 实现
      */
     private String getSmaliForClass(DexBackedDexFile dexFile, ClassDef classDef) {
-        try {
-            BaksmaliOptions options = new BaksmaliOptions();
-            ClassDefinition classDefinition = new ClassDefinition(options, classDef);
-            java.io.StringWriter stringWriter = new java.io.StringWriter();
-            BaksmaliWriter writer = new BaksmaliWriter(stringWriter, null);
-            classDefinition.writeTo(writer);
-            writer.close();
-            return stringWriter.toString();
-        } catch (Exception e) {
-            return "";
-        }
+        // 此方法已弃用，使用 C++ 实现
+        return "";
     }
 
 
@@ -3071,6 +3063,9 @@ public class DexManager {
             dexInputStream.close();
             byte[] dexBytes = baos.toByteArray();
             
+            // 保存 DEX 字节用于 C++ 操作
+            cache.dexBytes = dexBytes;
+            
             // 解析 DEX 文件并缓存所有 ClassDef
             DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexBytes);
             cache.dexVersion = 35; // 默认 DEX 版本
@@ -3102,7 +3097,7 @@ public class DexManager {
     }
     
     /**
-     * 从 APK 中的 DEX 文件获取类的 Smali 代码（使用缓存）
+     * 从 APK 中的 DEX 文件获取类的 Smali 代码（使用 C++ 实现）
      */
     public JSObject getClassSmaliFromApk(String apkPath, String dexPath, String className) throws Exception {
         JSObject result = new JSObject();
@@ -3117,26 +3112,22 @@ public class DexManager {
         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;
+            // 使用 C++ 实现获取 Smali
+            if (CppDex.isAvailable()) {
+                ApkDexCache cache = getOrCreateDexCache(apkPath, dexPath);
+                if (cache.dexBytes != null) {
+                    String smaliJson = CppDex.getClassSmali(cache.dexBytes, targetType);
+                    if (smaliJson != null && !smaliJson.contains("\"error\"")) {
+                        org.json.JSONObject smaliResult = new org.json.JSONObject(smaliJson);
+                        String smali = smaliResult.optString("smali", "");
+                        if (!smali.isEmpty()) {
+                            result.put("smali", smali);
+                            return result;
+                        }
+                    }
+                }
             }
-            
-            // 使用 baksmali 库生成正确的 Smali 代码
-            BaksmaliOptions options = new BaksmaliOptions();
-            ClassDefinition classDefinition = new ClassDefinition(options, targetClass);
-            
-            java.io.StringWriter stringWriter = new java.io.StringWriter();
-            BaksmaliWriter writer = new BaksmaliWriter(stringWriter, null);
-            classDefinition.writeTo(writer);
-            writer.close();
-            
-            result.put("smali", stringWriter.toString());
-            
+            result.put("smali", "# 类未找到或 C++ 库不可用: " + className);
         } catch (Exception e) {
             result.put("smali", "# 加载失败: " + e.getMessage());
         }

package/package.json

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