capacitor-dex-editor 0.0.16 → 0.0.18

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

@@ -29,6 +29,8 @@ 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;
 
@@ -1588,120 +1590,16 @@ public class DexManager {
                 return result;
             }
             
-            // 生成 Smali 代码
-            smali.append(".class ");
-            // 访问标志
-            int accessFlags = targetClass.getAccessFlags();
-            if ((accessFlags & 0x0001) != 0) smali.append("public ");
-            if ((accessFlags & 0x0010) != 0) smali.append("final ");
-            if ((accessFlags & 0x0020) != 0) smali.append("super ");
-            if ((accessFlags & 0x0200) != 0) smali.append("interface ");
-            if ((accessFlags & 0x0400) != 0) smali.append("abstract ");
-            if ((accessFlags & 0x1000) != 0) smali.append("synthetic ");
-            if ((accessFlags & 0x2000) != 0) smali.append("annotation ");
-            if ((accessFlags & 0x4000) != 0) smali.append("enum ");
-            smali.append(targetClass.getType()).append("\n");
+            // 使用 baksmali 库生成正确的 Smali 代码
+            BaksmaliOptions options = new BaksmaliOptions();
+            ClassDefinition classDefinition = new ClassDefinition(options, targetClass);
             
-            // 父类
-            String superClass = targetClass.getSuperclass();
-            if (superClass != null) {
-                smali.append(".super ").append(superClass).append("\n");
-            }
-            
-            // 源文件
-            String sourceFile = targetClass.getSourceFile();
-            if (sourceFile != null) {
-                smali.append(".source \"").append(sourceFile).append("\"\n");
-            }
-            
-            // 实现的接口
-            for (String iface : targetClass.getInterfaces()) {
-                smali.append(".implements ").append(iface).append("\n");
-            }
-            
-            smali.append("\n");
-            
-            // 分离静态字段和实例字段
-            java.util.List<Field> staticFields = new java.util.ArrayList<>();
-            java.util.List<Field> instanceFields = new java.util.ArrayList<>();
-            for (Field field : targetClass.getFields()) {
-                if ((field.getAccessFlags() & 0x0008) != 0) {
-                    staticFields.add(field);
-                } else {
-                    instanceFields.add(field);
-                }
-            }
-            
-            // 静态字段
-            if (!staticFields.isEmpty()) {
-                smali.append("# static fields\n");
-                for (Field field : staticFields) {
-                    smali.append(".field ");
-                    int fFlags = field.getAccessFlags();
-                    if ((fFlags & 0x0001) != 0) smali.append("public ");
-                    if ((fFlags & 0x0002) != 0) smali.append("private ");
-                    if ((fFlags & 0x0004) != 0) smali.append("protected ");
-                    smali.append("static ");
-                    if ((fFlags & 0x0010) != 0) smali.append("final ");
-                    if ((fFlags & 0x0040) != 0) smali.append("volatile ");
-                    if ((fFlags & 0x0080) != 0) smali.append("transient ");
-                    if ((fFlags & 0x1000) != 0) smali.append("synthetic ");
-                    if ((fFlags & 0x4000) != 0) smali.append("enum ");
-                    smali.append(field.getName()).append(":").append(field.getType()).append("\n");
-                }
-                smali.append("\n");
-            }
-            
-            // 实例字段
-            if (!instanceFields.isEmpty()) {
-                smali.append("# instance fields\n");
-                for (Field field : instanceFields) {
-                    smali.append(".field ");
-                    int fFlags = field.getAccessFlags();
-                    if ((fFlags & 0x0001) != 0) smali.append("public ");
-                    if ((fFlags & 0x0002) != 0) smali.append("private ");
-                    if ((fFlags & 0x0004) != 0) smali.append("protected ");
-                    if ((fFlags & 0x0010) != 0) smali.append("final ");
-                    if ((fFlags & 0x0040) != 0) smali.append("volatile ");
-                    if ((fFlags & 0x0080) != 0) smali.append("transient ");
-                    if ((fFlags & 0x1000) != 0) smali.append("synthetic ");
-                    if ((fFlags & 0x4000) != 0) smali.append("enum ");
-                    smali.append(field.getName()).append(":").append(field.getType()).append("\n");
-                }
-                smali.append("\n");
-            }
-            
-            // 分离直接方法和虚拟方法
-            java.util.List<Method> directMethods = new java.util.ArrayList<>();
-            java.util.List<Method> virtualMethods = new java.util.ArrayList<>();
-            for (Method method : targetClass.getMethods()) {
-                int mFlags = method.getAccessFlags();
-                // direct methods: private, static, constructor
-                if ((mFlags & 0x0002) != 0 || (mFlags & 0x0008) != 0 || 
-                    method.getName().equals("<init>") || method.getName().equals("<clinit>")) {
-                    directMethods.add(method);
-                } else {
-                    virtualMethods.add(method);
-                }
-            }
-            
-            // 直接方法
-            if (!directMethods.isEmpty()) {
-                smali.append("\n# direct methods\n");
-                for (Method method : directMethods) {
-                    outputMethod(smali, method);
-                }
-            }
-            
-            // 虚拟方法
-            if (!virtualMethods.isEmpty()) {
-                smali.append("\n# virtual methods\n");
-                for (Method method : virtualMethods) {
-                    outputMethod(smali, method);
-                }
-            }
+            java.io.StringWriter stringWriter = new java.io.StringWriter();
+            BaksmaliWriter writer = new BaksmaliWriter(stringWriter, null);
+            classDefinition.writeTo(writer);
+            writer.close();
             
-            result.put("smali", smali.toString());
+            result.put("smali", stringWriter.toString());
             
         } finally {
             if (dexInputStream != null) {
@@ -1715,179 +1613,6 @@ public class DexManager {
         return result;
     }
 
-    /**
-     * 输出单个方法的 Smali 代码 (MT 风格)
-     */
-    private void outputMethod(StringBuilder smali, Method method) {
-        smali.append(".method ");
-        int mFlags = method.getAccessFlags();
-        if ((mFlags & 0x0001) != 0) smali.append("public ");
-        if ((mFlags & 0x0002) != 0) smali.append("private ");
-        if ((mFlags & 0x0004) != 0) smali.append("protected ");
-        if ((mFlags & 0x0008) != 0) smali.append("static ");
-        if ((mFlags & 0x0010) != 0) smali.append("final ");
-        if ((mFlags & 0x0020) != 0) smali.append("synchronized ");
-        if ((mFlags & 0x0040) != 0) smali.append("bridge ");
-        if ((mFlags & 0x0080) != 0) smali.append("varargs ");
-        if ((mFlags & 0x0100) != 0) smali.append("native ");
-        if ((mFlags & 0x0400) != 0) smali.append("abstract ");
-        if ((mFlags & 0x0800) != 0) smali.append("strictfp ");
-        if ((mFlags & 0x1000) != 0) smali.append("synthetic ");
-        if ((mFlags & 0x10000) != 0) smali.append("constructor ");
-        if ((mFlags & 0x20000) != 0) smali.append("declared-synchronized ");
-        
-        smali.append(method.getName());
-        smali.append("(");
-        for (CharSequence param : method.getParameterTypes()) {
-            smali.append(param);
-        }
-        smali.append(")");
-        smali.append(method.getReturnType());
-        smali.append("\n");
-        
-        MethodImplementation impl = method.getImplementation();
-        if (impl != null) {
-            smali.append("    .registers ").append(impl.getRegisterCount()).append("\n\n");
-            
-            // 输出指令，跟踪标签位置
-            java.util.Map<Integer, String> labelMap = new java.util.HashMap<>();
-            int codeOffset = 0;
-            
-            // 第一遍：收集所有标签位置
-            for (Instruction instruction : impl.getInstructions()) {
-                if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) {
-                    com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction offInstr = 
-                        (com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) instruction;
-                    int targetOffset = codeOffset + offInstr.getCodeOffset();
-                    labelMap.put(targetOffset, ":cond_" + Integer.toHexString(targetOffset));
-                }
-                codeOffset += instruction.getCodeUnits();
-            }
-            
-            // 第二遍：输出指令 (MT 风格：每条指令后有空行)
-            codeOffset = 0;
-            for (Instruction instruction : impl.getInstructions()) {
-                // 输出标签（如果有）
-                if (labelMap.containsKey(codeOffset)) {
-                    smali.append("\n    ").append(labelMap.get(codeOffset)).append("\n");
-                }
-                
-                smali.append("    ").append(instruction.getOpcode().name.toLowerCase().replace('_', '-'));
-                String params = formatInstruction(instruction);
-                if (!params.isEmpty()) {
-                    smali.append(" ").append(params);
-                }
-                smali.append("\n\n");  // MT 风格：每条指令后有空行
-                
-                codeOffset += instruction.getCodeUnits();
-            }
-        }
-        
-        smali.append(".end method\n");
-    }
-
-    /**
-     * 格式化指令参数 - 使用正确的 Smali 语法格式
-     * invoke 指令格式: invoke-xxx {v0, v1}, Lclass;->method()V
-     */
-    private String formatInstruction(Instruction instruction) {
-        StringBuilder sb = new StringBuilder();
-        String opName = instruction.getOpcode().name.toLowerCase();
-        boolean isInvokeOrFilled = opName.startsWith("invoke") || opName.startsWith("filled-new-array");
-        
-        // 收集寄存器
-        java.util.List<Integer> registers = new java.util.ArrayList<>();
-        
-        // 处理多寄存器指令 (invoke 指令使用 FiveRegisterInstruction)
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction regInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction) instruction;
-            int regCount = regInstr.getRegisterCount();
-            if (regCount >= 1) registers.add(regInstr.getRegisterC());
-            if (regCount >= 2) registers.add(regInstr.getRegisterD());
-            if (regCount >= 3) registers.add(regInstr.getRegisterE());
-            if (regCount >= 4) registers.add(regInstr.getRegisterF());
-            if (regCount >= 5) registers.add(regInstr.getRegisterG());
-        } else if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.RegisterRangeInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.RegisterRangeInstruction regInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.RegisterRangeInstruction) instruction;
-            int start = regInstr.getStartRegister();
-            int count = regInstr.getRegisterCount();
-            for (int i = 0; i < count; i++) {
-                registers.add(start + i);
-            }
-        } else {
-            // 处理普通寄存器指令
-            if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction) {
-                com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction regInstr = 
-                    (com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction) instruction;
-                registers.add(regInstr.getRegisterA());
-            }
-            
-            if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction) {
-                com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction regInstr = 
-                    (com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction) instruction;
-                registers.add(regInstr.getRegisterB());
-            }
-            
-            if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction) {
-                com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction regInstr = 
-                    (com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction) instruction;
-                registers.add(regInstr.getRegisterC());
-            }
-        }
-        
-        // 格式化寄存器部分
-        if (!registers.isEmpty()) {
-            if (isInvokeOrFilled) {
-                // invoke 指令使用 {} 包裹寄存器
-                sb.append("{");
-                for (int i = 0; i < registers.size(); i++) {
-                    if (i > 0) sb.append(", ");
-                    sb.append("v").append(registers.get(i));
-                }
-                sb.append("}");
-            } else {
-                // 普通指令直接列出寄存器
-                for (int i = 0; i < registers.size(); i++) {
-                    if (i > 0) sb.append(", ");
-                    sb.append("v").append(registers.get(i));
-                }
-            }
-        }
-        
-        // 处理引用指令
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction refInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append(refInstr.getReference().toString());
-        }
-        
-        // 处理字面量指令
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction litInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append("0x").append(Long.toHexString(litInstr.getWideLiteral()));
-        } else if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction litInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append("0x").append(Integer.toHexString(litInstr.getNarrowLiteral()));
-        }
-        
-        // 处理偏移指令
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction offInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append(":label_").append(offInstr.getCodeOffset());
-        }
-        
-        return sb.toString();
-    }
-
     /**
      * 保存修改后的 Smali 代码到 APK 中的 DEX 文件
      * 注意：这是一个复杂操作，需要重新编译 Smali 并修改 DEX 文件
@@ -1954,20 +1679,127 @@ public class DexManager {
             
             Log.d(TAG, "Smali compiled successfully to: " + outputDex.getAbsolutePath());
             
-            // TODO: 将编译后的 dex 合并回原 APK
-            // 这是一个复杂的操作，需要：
-            // 1. 解压 APK
-            // 2. 替换/合并 DEX 文件中的类
-            // 3. 重新打包 APK
-            // 4. 重新签名 APK
+            // 将编译后的类合并到原 DEX 文件中
+            // 1. 读取原 APK 中的 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();
+                cleanupTempDir(tempDir);
+                return result;
+            }
+            
+            // 读取原 DEX
+            java.io.InputStream dexInputStream = zipFile.getInputStream(dexEntry);
+            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+            byte[] buffer = new byte[8192];
+            int len;
+            while ((len = dexInputStream.read(buffer)) != -1) {
+                baos.write(buffer, 0, len);
+            }
+            byte[] originalDexBytes = baos.toByteArray();
+            dexInputStream.close();
+            
+            // 解析原 DEX 和新编译的 DEX
+            DexBackedDexFile originalDex = new DexBackedDexFile(Opcodes.getDefault(), originalDexBytes);
+            DexBackedDexFile newDex = DexBackedDexFile.fromInputStream(Opcodes.getDefault(), 
+                new java.io.BufferedInputStream(new java.io.FileInputStream(outputDex)));
+            
+            // 合并 DEX：用新类替换原类
+            String targetType = "L" + className.replace(".", "/") + ";";
+            java.util.List<ClassDef> mergedClasses = new java.util.ArrayList<>();
+            
+            // 添加原 DEX 中除目标类外的所有类
+            for (ClassDef classDef : originalDex.getClasses()) {
+                if (!classDef.getType().equals(targetType)) {
+                    mergedClasses.add(classDef);
+                }
+            }
+            
+            // 添加新编译的类
+            for (ClassDef classDef : newDex.getClasses()) {
+                mergedClasses.add(classDef);
+            }
+            
+            Log.d(TAG, "Merged " + mergedClasses.size() + " classes");
+            
+            // 创建新的 DEX 文件
+            java.io.File mergedDexFile = new java.io.File(tempDir, "classes_merged.dex");
+            DexPool dexPool = new DexPool(Opcodes.getDefault());
+            for (ClassDef classDef : mergedClasses) {
+                dexPool.internClass(classDef);
+            }
+            dexPool.writeTo(new FileDataStore(mergedDexFile));
+            
+            Log.d(TAG, "Merged DEX written to: " + mergedDexFile.getAbsolutePath());
+            
+            // 2. 创建新的 APK（复制原 APK 并替换 DEX）
+            java.io.File outputApk = new java.io.File(apkPath + ".modified.apk");
+            java.util.zip.ZipOutputStream zos = new java.util.zip.ZipOutputStream(
+                new java.io.FileOutputStream(outputApk));
+            
+            // 复制原 APK 中的所有条目（除了要替换的 DEX）
+            java.util.Enumeration<? extends java.util.zip.ZipEntry> entries = zipFile.entries();
+            while (entries.hasMoreElements()) {
+                java.util.zip.ZipEntry entry = entries.nextElement();
+                if (entry.getName().equals(dexPath)) {
+                    // 跳过原 DEX，稍后添加新的
+                    continue;
+                }
+                
+                // 复制其他条目
+                java.util.zip.ZipEntry newEntry = new java.util.zip.ZipEntry(entry.getName());
+                zos.putNextEntry(newEntry);
+                
+                if (!entry.isDirectory()) {
+                    java.io.InputStream is = zipFile.getInputStream(entry);
+                    while ((len = is.read(buffer)) != -1) {
+                        zos.write(buffer, 0, len);
+                    }
+                    is.close();
+                }
+                zos.closeEntry();
+            }
+            
+            // 添加修改后的 DEX
+            java.util.zip.ZipEntry newDexEntry = new java.util.zip.ZipEntry(dexPath);
+            zos.putNextEntry(newDexEntry);
+            java.io.FileInputStream fis = new java.io.FileInputStream(mergedDexFile);
+            while ((len = fis.read(buffer)) != -1) {
+                zos.write(buffer, 0, len);
+            }
+            fis.close();
+            zos.closeEntry();
+            
+            zos.close();
+            zipFile.close();
+            
+            Log.d(TAG, "Modified APK written to: " + outputApk.getAbsolutePath());
+            
+            // 3. 替换原 APK（先备份）
+            java.io.File backupApk = new java.io.File(apkPath + ".backup");
+            java.io.File originalApkFile = new java.io.File(apkPath);
+            
+            // 复制原 APK 作为备份
+            copyFile(originalApkFile, backupApk);
+            
+            // 用修改后的 APK 替换原 APK
+            copyFile(outputApk, originalApkFile);
+            
+            // 删除临时修改的 APK
+            outputApk.delete();
+            
+            Log.d(TAG, "APK updated successfully. Backup at: " + backupApk.getAbsolutePath());
             
-            // 目前先返回成功，实际保存功能需要更多实现
             result.put("success", true);
-            result.put("message", "Smali 编译成功，但完整保存功能需要进一步实现");
-            result.put("compiledDexPath", outputDex.getAbsolutePath());
+            result.put("message", "Smali 保存成功！已更新 APK");
+            result.put("backupPath", backupApk.getAbsolutePath());
             
-            // 清理临时文件（暂时保留以便调试）
-            // cleanupTempDir(tempDir);
+            // 清理临时文件
+            cleanupTempDir(tempDir);
             
         } catch (Exception e) {
             Log.e(TAG, "Error saving smali: " + e.getMessage(), e);
@@ -1978,6 +1810,21 @@ public class DexManager {
         return result;
     }
 
+    /**
+     * 复制文件
+     */
+    private void copyFile(java.io.File src, java.io.File dst) throws java.io.IOException {
+        java.io.FileInputStream fis = new java.io.FileInputStream(src);
+        java.io.FileOutputStream fos = new java.io.FileOutputStream(dst);
+        byte[] buffer = new byte[8192];
+        int len;
+        while ((len = fis.read(buffer)) != -1) {
+            fos.write(buffer, 0, len);
+        }
+        fis.close();
+        fos.close();
+    }
+
     /**
      * 清理临时目录
      */

package/package.json

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