js-confuser 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# `1.4.2`
+Eval Fix
+
+- Fixed [#31](https://github.com/MichaelXF/js-confuser/issues/31)
+- - Eval and Integrity didn't work together, fixed in this version.
+
 # `1.4.1`
 AntiDebug Fix
 

package/dist/transforms/eval.js

@@ -27,7 +27,7 @@ class Eval extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _insert.isFunction)(object) && object.type != "ArrowFunctionExpression" && !object.$eval;
+    return (0, _insert.isFunction)(object) && object.type != "ArrowFunctionExpression" && !object.$eval && !object.$dispatcherSkip;
   }
 
   transform(object, parents) {

package/package.json

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

package/src/transforms/eval.ts

@@ -22,7 +22,8 @@ export default class Eval extends Transform {
     return (
       isFunction(object) &&
       object.type != "ArrowFunctionExpression" &&
-      !object.$eval
+      !object.$eval &&
+      !object.$dispatcherSkip
     );
   }
 

package/test/transforms/eval.test.ts

@@ -48,3 +48,31 @@ it("should move function declarations to the top of the block", async () => {
 
   expect(value).toStrictEqual(100);
 });
+
+it("should work with Integrity also enabled", async () => {
+  var code = `
+    input("Hello World")
+  `;
+
+  var output = await JsConfuser(code, {
+    target: "node",
+    compact: false,
+    eval: true,
+    lock: {
+      integrity: true,
+    },
+  });
+
+  expect(output).toContain("eval(");
+
+  var value = "never_called",
+    input = (valueIn) => (value = valueIn);
+
+  try {
+    eval(output);
+  } catch (e) {
+    expect(e).toStrictEqual(undefined);
+  }
+
+  expect(value).toStrictEqual("Hello World");
+});