js-confuser 1.5.2 → 1.5.4

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# `1.5.4`
+Small fix
+
+- Fixed [#45](https://github.com/MichaelXF/js-confuser/issues/45)
+- - Opaque predicates fixed to not this cause error
+
+
+# `1.5.3`
+Shuffle fix
+
+- Fixed [#48](https://github.com/MichaelXF/js-confuser/issues/48)
+- - Shuffle was re-assigning `const` variables, fixed in this version.
+
 # `1.5.2`
 Mini fixes
 

package/dist/transforms/opaquePredicates.js

@@ -132,7 +132,7 @@ class OpaquePredicates extends _transform.default {
 
       var cloned = (0, _insert.clone)(expr);
 
-      if (object.type == "SwitchCase") {
+      if (object.type == "SwitchCase" && object.test) {
         var matching = (0, _gen.Identifier)((0, _random.choice)(["undefined", "null"]));
         var test = object.test;
 

package/dist/transforms/shuffle.js

@@ -126,7 +126,7 @@ class Shuffle extends _transform.default {
         if (varDeclarator.type == "VariableDeclarator") {
           var varDec = parents[2];
 
-          if (varDec.type == "VariableDeclaration") {
+          if (varDec.type == "VariableDeclaration" && varDec.kind !== "const") {
             var body = parents[3];
 
             if (varDec.declarations.length == 1 && Array.isArray(body) && varDeclarator.id.type === "Identifier" && varDeclarator.init === object) {

package/package.json

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

package/src/transforms/opaquePredicates.ts

@@ -199,8 +199,8 @@ export default class OpaquePredicates extends Transform {
       }
 
       var cloned = clone(expr);
-      if (object.type == "SwitchCase") {
-        var matching = Identifier(choice(["undefined", "null"]));
+      if (object.type == "SwitchCase" && object.test) {
+        var matching: Node = Identifier(choice(["undefined", "null"]));
 
         var test = object.test;
 

package/src/transforms/shuffle.ts

@@ -149,7 +149,7 @@ export default class Shuffle extends Transform {
         var varDeclarator = parents[0];
         if (varDeclarator.type == "VariableDeclarator") {
           var varDec = parents[2];
-          if (varDec.type == "VariableDeclaration") {
+          if (varDec.type == "VariableDeclaration" && varDec.kind !== "const") {
             var body = parents[3];
             if (
               varDec.declarations.length == 1 &&

package/test/transforms/opaquePredicates.test.ts

@@ -16,3 +16,28 @@ it("should append logical expressions", async () => {
 
   expect(output).not.toContain("(test)");
 });
+
+// https://github.com/MichaelXF/js-confuser/issues/45
+it("should work on default Switch cases", async ()=>{
+    var code = `
+
+    switch (0) {
+        default:
+             input(true);
+    }
+  `;
+
+  var output = await JsConfuser(code, {
+    target: "browser",
+    opaquePredicates: true,
+  });
+
+  var value;
+  function input(valueIn){
+    value = valueIn;
+  }
+
+  eval(output);
+
+  expect(value).toStrictEqual(true);
+})

package/test/transforms/shuffle.test.ts

@@ -89,3 +89,28 @@ it("should shuffle arrays based on hash and unshuffle incorrect if changed", asy
 
   expect(different).toStrictEqual(true);
 });
+
+// https://github.com/MichaelXF/js-confuser/issues/48
+it("Should properly apply to const variables", async () => {
+    var code = `
+      const TEST_ARRAY = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+  
+      input(TEST_ARRAY);
+    `;
+
+    var output = await JsConfuser(code, {
+      target: "browser",
+      shuffle: true,
+    });
+
+    expect(output).toContain("TEST_ARRAY=function");
+  
+    var value;
+    function input(valueIn) {
+      value = valueIn;
+    }
+  
+    eval(output);
+  
+    expect(value).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+  });