capacitor-dex-editor 0.0.54 → 0.0.55

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

@@ -2232,51 +2232,31 @@ public class DexManager {
         }
         
         try {
-            // 创建临时目录存储 smali 文件（使用系统临时目录）
-            java.io.File tempDir = new java.io.File(System.getProperty("java.io.tmpdir"), "smali_temp_" + System.currentTimeMillis());
-            if (!tempDir.mkdirs()) {
-                result.put("success", false);
-                result.put("error", "无法创建临时目录");
-                return result;
-            }
-            
-            // 将类名转换为文件路径
-            String classPath = className.replace(".", "/") + ".smali";
-            java.io.File smaliFile = new java.io.File(tempDir, classPath);
-            smaliFile.getParentFile().mkdirs();
-            
-            // 写入 smali 文件
-            try (java.io.FileWriter writer = new java.io.FileWriter(smaliFile)) {
-                writer.write(smaliContent);
-            }
-            
-            Log.d(TAG, "Smali file written to: " + smaliFile.getAbsolutePath());
-            
-            // 使用 smali 库编译 smali 文件为 dex
-            // 注意：这需要 smali 库的支持
-            java.io.File outputDex = new java.io.File(tempDir, "classes_modified.dex");
+            // 使用优化的 smali2.Smali 直接编译成 ClassDef（无需临时文件）
+            reportTitle("编译 Smali");
+            reportMessage("正在编译 " + className + "...");
+            reportProgress(10, 100);
             
-            // 使用 SmaliOptions 编译
             com.android.tools.smali.smali.SmaliOptions options = new com.android.tools.smali.smali.SmaliOptions();
-            options.outputDexFile = outputDex.getAbsolutePath();
             options.apiLevel = 30;
             
-            java.util.List<String> inputFiles = new java.util.ArrayList<>();
-            inputFiles.add(smaliFile.getAbsolutePath());
-            
-            boolean success = com.android.tools.smali.smali.Smali.assemble(options, inputFiles);
-            
-            if (!success) {
+            // 直接编译 Smali 代码为 ClassDef
+            ClassDef newClassDef;
+            try {
+                newClassDef = com.android.tools.smali.smali2.Smali.assemble(smaliContent, options, 35);
+            } catch (Exception e) {
                 result.put("success", false);
-                result.put("error", "Smali 编译失败");
-                cleanupTempDir(tempDir);
+                result.put("error", "Smali 编译失败: " + e.getMessage());
                 return result;
             }
             
-            Log.d(TAG, "Smali compiled successfully to: " + outputDex.getAbsolutePath());
+            reportProgress(30, 100);
+            Log.d(TAG, "Smali compiled successfully to ClassDef");
+            
+            // 读取原 APK 中的 DEX 文件
+            reportTitle("合并 DEX");
+            reportMessage("读取原 DEX...");
             
-            // 将编译后的类合并到原 DEX 文件中
-            // 1. 读取原 APK 中的 DEX 文件
             java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(apkPath);
             java.util.zip.ZipEntry dexEntry = zipFile.getEntry(dexPath);
             
@@ -2284,14 +2264,13 @@ public class DexManager {
                 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];
+            byte[] buffer = new byte[16384];
             int len;
             while ((len = dexInputStream.read(buffer)) != -1) {
                 baos.write(buffer, 0, len);
@@ -2299,12 +2278,12 @@ public class DexManager {
             byte[] originalDexBytes = baos.toByteArray();
             dexInputStream.close();
             
-            // 解析原 DEX 和新编译的 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：用新类替换原类
+            reportMessage("收集类定义...");
+            reportProgress(40, 100);
+            
             String targetType = "L" + className.replace(".", "/") + ";";
             java.util.List<ClassDef> mergedClasses = new java.util.ArrayList<>();
             
@@ -2316,28 +2295,43 @@ public class DexManager {
             }
             
             // 添加新编译的类
-            for (ClassDef classDef : newDex.getClasses()) {
-                mergedClasses.add(classDef);
-            }
+            mergedClasses.add(newClassDef);
             
             Log.d(TAG, "Merged " + mergedClasses.size() + " classes");
             
-            // 创建新的 DEX 文件
-            java.io.File mergedDexFile = new java.io.File(tempDir, "classes_merged.dex");
+            // 创建新的 DEX 文件（使用内存）
+            reportMessage("写入 DEX (" + mergedClasses.size() + " 个类)...");
+            reportProgress(50, 100);
+            
             DexPool dexPool = new DexPool(Opcodes.getDefault());
+            int totalClasses = mergedClasses.size();
+            int currentClass = 0;
             for (ClassDef classDef : mergedClasses) {
                 dexPool.internClass(classDef);
+                currentClass++;
+                if (currentClass % 100 == 0 || currentClass == totalClasses) {
+                    reportProgress(50 + (currentClass * 30 / totalClasses), 100);
+                }
             }
-            dexPool.writeTo(new FileDataStore(mergedDexFile));
             
-            Log.d(TAG, "Merged DEX written to: " + mergedDexFile.getAbsolutePath());
+            // 使用内存写入 DEX（避免临时文件）
+            reportProgress(80, 100);
+            com.android.tools.smali.dexlib2.writer.io.MemoryDataStore memoryStore = 
+                new com.android.tools.smali.dexlib2.writer.io.MemoryDataStore();
+            dexPool.writeTo(memoryStore);
+            byte[] newDexBytes = java.util.Arrays.copyOf(memoryStore.getBuffer(), memoryStore.getSize());
+            
+            Log.d(TAG, "Merged DEX size: " + newDexBytes.length + " bytes");
             
             zipFile.close();
             
             // MT 风格：直接替换 APK 内的 DEX
+            reportTitle("更新 APK");
+            reportMessage("正在替换 DEX...");
+            reportProgress(85, 100);
+            
             java.io.File apkFile = new java.io.File(apkPath);
             java.io.File tempApkFile = new java.io.File(apkPath + ".tmp");
-            byte[] newDexBytes = readFileBytes(mergedDexFile);
             
             Log.d(TAG, "Replacing DEX in APK (MT style)...");
             
@@ -2393,15 +2387,13 @@ public class DexManager {
             }
             
             Log.d(TAG, "APK updated successfully: " + apkPath);
+            reportProgress(100, 100);
             
             result.put("success", true);
             result.put("message", "Smali 编译成功！APK 已更新");
             result.put("apkPath", apkPath);
             result.put("needSign", true);
             
-            // 清理临时文件
-            cleanupTempDir(tempDir);
-            
         } catch (Exception e) {
             Log.e(TAG, "Error saving smali: " + e.getMessage(), e);
             result.put("success", false);

package/android/src/main/java/com/android/tools/smali/smali2/Smali.java

@@ -0,0 +1,102 @@
+/*
+ * Based on Dex-Editor-Android by developer-krushna
+ * Original Author @MikeAndrson
+ * 
+ * 直接将 Smali 代码编译成 ClassDef，无需临时文件
+ */
+
+package com.android.tools.smali.smali2;
+
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.iface.ClassDef;
+import com.android.tools.smali.dexlib2.writer.builder.DexBuilder;
+import com.android.tools.smali.smali.SmaliOptions;
+
+import java.io.StringReader;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.runtime.tree.CommonTreeNodeStream;
+
+public class Smali {
+
+    public static ClassDef assemble(String smaliCode, SmaliOptions options, int dexVer)
+            throws Exception {
+        DexBuilder dexBuilder = new DexBuilder(Opcodes.forDexVersion(dexVer));
+
+        SmaliCatchErrFlexLexer lexer = new SmaliCatchErrFlexLexer(new StringReader(smaliCode), options.apiLevel);
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+
+        SmaliCatchErrParser parser = new SmaliCatchErrParser(tokens);
+        parser.setVerboseErrors(options.verboseErrors);
+        parser.setAllowOdex(options.allowOdexOpcodes);
+        parser.setApiLevel(dexVer);
+
+        SmaliCatchErrParser.smali_file_return result = parser.smali_file();
+
+        if (lexer.getNumberOfSyntaxErrors() > 0) {
+            throw new Exception(lexer.getErrorsString());
+        }
+
+        if (parser.getNumberOfSyntaxErrors() > 0) {
+            throw new Exception(parser.getErrorsString());
+        }
+
+        CommonTree t = result.getTree();
+
+        CommonTreeNodeStream treeStream = new CommonTreeNodeStream(t);
+        treeStream.setTokenStream(tokens);
+
+        SmaliCatchErrTreeWalker treeWalker = new SmaliCatchErrTreeWalker(treeStream);
+        treeWalker.setApiLevel(dexVer);
+        treeWalker.setVerboseErrors(options.verboseErrors);
+        treeWalker.setDexBuilder(dexBuilder);
+
+        ClassDef classDef = treeWalker.smali_file();
+
+        if (treeWalker.getNumberOfSyntaxErrors() > 0) {
+            throw new Exception(treeWalker.getErrorsString());
+        }
+
+        return classDef;
+    }
+
+    public static ClassDef assemble(String smaliCode, SmaliOptions options) throws Exception {
+        DexBuilder dexBuilder = new DexBuilder(Opcodes.forApi(options.apiLevel));
+
+        SmaliCatchErrFlexLexer lexer = new SmaliCatchErrFlexLexer(new StringReader(smaliCode), options.apiLevel);
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+
+        SmaliCatchErrParser parser = new SmaliCatchErrParser(tokens);
+        parser.setVerboseErrors(options.verboseErrors);
+        parser.setAllowOdex(options.allowOdexOpcodes);
+        parser.setApiLevel(options.apiLevel);
+
+        SmaliCatchErrParser.smali_file_return result = parser.smali_file();
+
+        if (lexer.getNumberOfSyntaxErrors() > 0) {
+            throw new Exception(lexer.getErrorsString());
+        }
+
+        if (parser.getNumberOfSyntaxErrors() > 0) {
+            throw new Exception(parser.getErrorsString());
+        }
+
+        CommonTree t = result.getTree();
+
+        CommonTreeNodeStream treeStream = new CommonTreeNodeStream(t);
+        treeStream.setTokenStream(tokens);
+
+        SmaliCatchErrTreeWalker treeWalker = new SmaliCatchErrTreeWalker(treeStream);
+        treeWalker.setApiLevel(options.apiLevel);
+        treeWalker.setVerboseErrors(options.verboseErrors);
+        treeWalker.setDexBuilder(dexBuilder);
+
+        ClassDef classDef = treeWalker.smali_file();
+
+        if (treeWalker.getNumberOfSyntaxErrors() > 0) {
+            throw new Exception(treeWalker.getErrorsString());
+        }
+
+        return classDef;
+    }
+}

package/android/src/main/java/com/android/tools/smali/smali2/SmaliCatchErrFlexLexer.java

@@ -0,0 +1,54 @@
+/*
+ * Based on Dex-Editor-Android by developer-krushna
+ * Original Author @MikeAndrson
+ */
+
+package com.android.tools.smali.smali2;
+
+import com.android.tools.smali.smali.InvalidToken;
+import com.android.tools.smali.smali.smaliFlexLexer;
+
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SmaliCatchErrFlexLexer extends smaliFlexLexer {
+
+    private StringBuilder errors = new StringBuilder();
+    private List<SyntaxError> syntaxErrors = new ArrayList<>();
+
+    public SmaliCatchErrFlexLexer(Reader reader, int apiLevel) {
+        super(reader, apiLevel);
+    }
+
+    @Override
+    public String getErrorHeader(InvalidToken invalidToken) {
+        errors.append("[")
+                .append(invalidToken.getLine())
+                .append(",")
+                .append(invalidToken.getCharPositionInLine())
+                .append("] Error for input '")
+                .append(invalidToken.getText())
+                .append("': ")
+                .append(invalidToken.getMessage())
+                .append("\n");
+
+        syntaxErrors.add(new SyntaxError(
+                invalidToken.getLine(),
+                invalidToken.getCharPositionInLine(),
+                invalidToken.getLine(),
+                invalidToken.getCharPositionInLine() + invalidToken.getText().length(),
+                invalidToken.getMessage()
+        ));
+
+        return super.getErrorHeader(invalidToken);
+    }
+
+    public String getErrorsString() {
+        return errors.toString();
+    }
+
+    public List<SyntaxError> getErrors() {
+        return syntaxErrors;
+    }
+}

package/android/src/main/java/com/android/tools/smali/smali2/SmaliCatchErrParser.java

@@ -0,0 +1,49 @@
+/*
+ * Based on Dex-Editor-Android by developer-krushna
+ * Original Author @MikeAndrson
+ */
+
+package com.android.tools.smali.smali2;
+
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import com.android.tools.smali.smali.smaliParser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SmaliCatchErrParser extends smaliParser {
+
+    private StringBuilder errors = new StringBuilder();
+    private List<SyntaxError> syntaxErrors = new ArrayList<>();
+
+    public SmaliCatchErrParser(CommonTokenStream tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void emitErrorMessage(String msg) {
+        errors.append(msg).append("\n");
+    }
+
+    public String getErrorsString() {
+        return errors.toString();
+    }
+
+    @Override
+    public void displayRecognitionError(String[] tokenNames, RecognitionException e) {
+        syntaxErrors.add(new SyntaxError(
+                e.line,
+                e.charPositionInLine,
+                e.line,
+                e.charPositionInLine + (e.token != null ? e.token.getText().length() : 1),
+                getErrorMessage(e, tokenNames)
+        ));
+
+        super.displayRecognitionError(tokenNames, e);
+    }
+
+    public List<SyntaxError> getErrors() {
+        return syntaxErrors;
+    }
+}

package/android/src/main/java/com/android/tools/smali/smali2/SmaliCatchErrTreeWalker.java

@@ -0,0 +1,49 @@
+/*
+ * Based on Dex-Editor-Android by developer-krushna
+ * Original Author @MikeAndrson
+ */
+
+package com.android.tools.smali.smali2;
+
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.tree.CommonTreeNodeStream;
+import com.android.tools.smali.smali.smaliTreeWalker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SmaliCatchErrTreeWalker extends smaliTreeWalker {
+
+    private StringBuilder errors = new StringBuilder();
+    private List<SyntaxError> syntaxErrors = new ArrayList<>();
+
+    public SmaliCatchErrTreeWalker(CommonTreeNodeStream treeStream) {
+        super(treeStream);
+    }
+
+    @Override
+    public void emitErrorMessage(String msg) {
+        errors.append(msg);
+        errors.append("\n");
+    }
+
+    public String getErrorsString() {
+        return errors.toString();
+    }
+
+    @Override
+    public void displayRecognitionError(String[] tokenNames, RecognitionException e) {
+        syntaxErrors.add(new SyntaxError(
+                e.line,
+                e.charPositionInLine,
+                e.line,
+                e.charPositionInLine + (e.token != null ? e.token.getText().length() : 1),
+                getErrorMessage(e, tokenNames)
+        ));
+        super.displayRecognitionError(tokenNames, e);
+    }
+
+    public List<SyntaxError> getErrors() {
+        return syntaxErrors;
+    }
+}

package/android/src/main/java/com/android/tools/smali/smali2/SyntaxError.java

@@ -0,0 +1,42 @@
+/*
+ * Based on Dex-Editor-Android by developer-krushna
+ * Original Author @MikeAndrson
+ */
+
+package com.android.tools.smali.smali2;
+
+public class SyntaxError {
+    private final int startLine;
+    private final int startColumn;
+    private final int endLine;
+    private final int endColumn;
+    private final String message;
+
+    public SyntaxError(int startLine, int startColumn, int endLine, int endColumn, String message) {
+        this.startLine = startLine;
+        this.startColumn = startColumn;
+        this.endLine = endLine;
+        this.endColumn = endColumn;
+        this.message = message;
+    }
+
+    public int getStartLine() {
+        return startLine;
+    }
+
+    public int getStartColumn() {
+        return startColumn;
+    }
+
+    public int getEndLine() {
+        return endLine;
+    }
+
+    public int getEndColumn() {
+        return endColumn;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

package/package.json

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