js-confuser 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# `1.4.1`
+AntiDebug Fix
+
+- Fixed [#28](https://github.com/MichaelXF/js-confuser/issues/28)
+- - AntiDebug was causing syntax errors in some scenarios, fixed in this version.
+
 # `1.4.0`
 Confusing Control Flow
 

package/dist/transforms/lock/antiDebug.js

@@ -43,7 +43,7 @@ class AntiDebug extends _transform.default {
     var startTimeName = this.getPlaceholder();
     var endTimeName = this.getPlaceholder();
     var isDevName = this.getPlaceholder();
-    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...(0, _template.default)("\n      var ".concat(startTimeName, " = new Date();\n      debugger;\n      var ").concat(endTimeName, " = new Date();\n      var ").concat(isDevName, " = ").concat(endTimeName, "-").concat(startTimeName, " > 1000;\n      ")).compile(), (0, _gen.IfStatement)((0, _gen.Identifier)(isDevName), this.options.lock.countermeasures ? this.lock.getCounterMeasuresCode() : [(0, _gen.WhileStatement)((0, _gen.Identifier)(isDevName), [(0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(startTimeName), (0, _gen.Identifier)(endTimeName))])], null)]);
+    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...(0, _template.default)("\n      var ".concat(startTimeName, " = new Date();\n      debugger;\n      var ").concat(endTimeName, " = new Date();\n      var ").concat(isDevName, " = ").concat(endTimeName, "-").concat(startTimeName, " > 1000;\n      ")).compile(), (0, _gen.IfStatement)((0, _gen.Identifier)(isDevName), this.options.lock.countermeasures ? this.lock.getCounterMeasuresCode() : [(0, _gen.WhileStatement)((0, _gen.Identifier)(isDevName), [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(startTimeName), (0, _gen.Identifier)(endTimeName)))])], null)]);
     tree.body.unshift(...DevToolsDetection.compile({
       functionName: fnName
     }));

package/dist/transforms/rgf.js

@@ -209,7 +209,8 @@ class RGF extends _transform.default {
           lock: {
             integrity: false
           },
-          eval: false
+          eval: false,
+          hideInitializingCode: false
         });
         var transforms = Object.values(obfuscator.transforms).filter(x => x.priority > this.priority);
         var embeddedFunction = { ...object,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-confuser",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "JavaScript Obfuscation Tool.",
   "main": "dist/index.js",
   "types": "index.d.ts",

package/src/transforms/lock/antiDebug.ts

@@ -4,6 +4,7 @@ import { isBlock } from "../../traverse";
 import {
   AssignmentExpression,
   DebuggerStatement,
+  ExpressionStatement,
   FunctionDeclaration,
   Identifier,
   IfStatement,
@@ -64,10 +65,12 @@ export default class AntiDebug extends Transform {
             ? this.lock.getCounterMeasuresCode()
             : [
                 WhileStatement(Identifier(isDevName), [
-                  AssignmentExpression(
-                    "=",
-                    Identifier(startTimeName),
-                    Identifier(endTimeName)
+                  ExpressionStatement(
+                    AssignmentExpression(
+                      "=",
+                      Identifier(startTimeName),
+                      Identifier(endTimeName)
+                    )
                   ),
                 ]),
               ],

package/src/transforms/rgf.ts

@@ -260,6 +260,7 @@ export default class RGF extends Transform {
             integrity: false,
           },
           eval: false,
+          hideInitializingCode: false,
         });
         var transforms = Object.values(obfuscator.transforms).filter(
           (x) => x.priority > this.priority

package/test/transforms/lock/antiDebug.test.ts

@@ -21,3 +21,46 @@ it("add a background interval", async () => {
 
   expect(output).toContain("setInterval");
 });
+
+it("should place syntax-correct code", async () => {
+  for (var i = 0; i < 50; i++) {
+    var output = await JsConfuser.obfuscate(
+      `
+    /**
+    * GitHub: https://github.com/MichaelXF/js-confuser
+    * NPM: https://www.npmjs.com/package/js-confuser
+    *
+    * Welcome to Js Confuser
+    * 
+    * You can obfuscate the code with the top right button 'Obfuscate'.
+    * 
+    * You can customize the obfuscator with the button 'Options'.
+    * (Set the target to 'node' for NodeJS apps)
+    *
+    * Happy Hacking!
+    */
+    
+    function greet(name){
+        var output = "Hello " + name + "!";
+    }
+    
+    greet("Internet User");
+    
+    `,
+      {
+        compact: true,
+        controlFlowFlattening: 0.25,
+        identifierGenerator: "randomized",
+        lock: { antiDebug: true },
+        minify: true,
+        target: "node",
+      }
+    );
+
+    try {
+      eval(output);
+    } catch (e) {
+      expect(e).toStrictEqual(undefined);
+    }
+  }
+});

package/test/transforms/rgf.test.ts

@@ -125,6 +125,35 @@ describe("RGF", () => {
 
     expect(value).toStrictEqual("Hello World");
   });
+
+  it("should work with hideInitializingCode enabled", async () => {
+    var output = await JsConfuser.obfuscate(
+      `
+function abc(x, y){
+  return x + y;
+}
+
+var result = abc(10, 50);
+input(console.log, result) 
+`,
+      {
+        target: "node",
+        identifierGenerator: "randomized",
+        hideInitializingCode: true,
+        rgf: true,
+        compact: false,
+        renameVariables: true,
+      }
+    );
+
+    var value = "never_called";
+    function input(_, valueIn) {
+      value = valueIn;
+    }
+
+    eval(output);
+    expect(value).toStrictEqual(60);
+  });
 });
 
 describe("RGF with the 'all' mode", () => {