chore: improve deobfuscator exec order

kuizuo · Nov 17, 2023 · d0ccaa1 · d0ccaa1
1 parent 310b74a
commit d0ccaa1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/play/jsonv6/index.js b/play/jsonv6/index.js
@@ -34,19 +34,19 @@ class MyDeOb extends Deob { }
   await deob.record(fileName, 3)
 
   // 最后通用处理
-  // deob.calcBinary()
-  // deob.calcBoolean()
-  // deob.replaceConstant()
-  // await deob.record(fileName, 4)
-
-  // deob.removeUnusedBlock()
-  // deob.removeUnusedVariables()
-  // deob.selfCallFnReplace()
-
-  // // 优化
-  // // deob.changeObjectAccessMode()
-  // deob.deleteExtra()
-  // deob.addComments()
+  deob.calcBinary()
+  deob.calcBoolean()
+  deob.replaceConstant()
+  await deob.record(fileName, 4)
+
+  deob.removeUnusedBlock()
+  deob.removeUnusedVariables()
+  deob.selfCallFnReplace()
+
+  // 优化
+  // deob.changeObjectAccessMode()
+  deob.deleteExtra()
+  deob.addComments()
 
   const code = deob.getCode()
   await fs.writeFile(`${__dirname}/output.js`, code)

diff --git a/website/utils/deobfuscator.ts b/website/utils/deobfuscator.ts
@@ -10,15 +10,13 @@ self.addEventListener(
 
     const deob = new Deob(code)
 
-    deob.findDecryptFnByCallCount(800, true)
+    deob.findDecryptFnByCallCount(200, true)
 
-    // deob.saveAllObject()
-    // deob.objectMemberReplace()
-    // await deob.record(fileName, 2)
+    deob.saveAllObject()
+    deob.objectMemberReplace()
 
     deob.switchFlat()
     deob.switchFlat()
-    deob.reParse()
 
     // 最后通用处理
     deob.calcBinary()
@@ -29,6 +27,8 @@ self.addEventListener(
     deob.removeUnusedVariables()
     deob.selfCallFnReplace()
 
+    // 优化
+    // deob.changeObjectAccessMode()
     deob.deleteExtra()
     deob.addComments()