js-confuser 1.5.5 → 1.5.7

package/CHANGELOG.md

@@ -1,8 +1,40 @@
+# `1.5.7`
+Countermeasures function fixes
+
+This update focuses on fixing Countermeasures bugs
+
+The `countermeasures` is custom callback function to invoke when a lock is triggered.
+
+- Fixed [#66](https://github.com/MichaelXF/js-confuser/issues/66)
+- - RGF to properly handle the countermeasures function
+
+- Added additional code to prevent an infinite loop from occurring
+
+- Slight improvements to RGF
+
+# `1.5.6`
+Website changed and RGF fixes
+
+The website is back at a different domain now: [https://master--hungry-shannon-c1ce6b.netlify.app/](https://master--hungry-shannon-c1ce6b.netlify.app/)
+
+This update focuses on fixing RGF bugs
+
+- Fixed [#64](https://github.com/MichaelXF/js-confuser/issues/64)
+- - RGF to properly handle Arrow functions and function expressions
+
+- RGF will no longer change getter/setter methods
+
+- RGF will no longer change class methods
+
+- RGF now works when using `mangled` variable names
+
+- Minify will remove unreachable code following a Throw statement
+
 # `1.5.5`
 Updates
 
 - Fixed [#53](https://github.com/MichaelXF/js-confuser/issues/53)
-- - Shuffle to not use common varialbe names like `x`
+- - Shuffle to not use common variable names like `x`
 
 - Fixed [#60](https://github.com/MichaelXF/js-confuser/issues/60)
 - - Rename Variables to properly handle function parameters
@@ -447,7 +479,7 @@ Available now on NPM: https://www.npmjs.com/package/js-confuser
 # `1.1.7`
 Website is Live
 
-- [JsConfuser.com](https://jsconfuser.com) is live!
+- [https://master--hungry-shannon-c1ce6b.netlify.app/](https://master--hungry-shannon-c1ce6b.netlify.app/) is live!
 - Check out the [js-confuser-website](https://github.com/MichaelXF/js-confuser-website) repo for more info
 
 - **⚠️ Breaking change**: `Rename Globals` is now enabled by default

package/README.md

@@ -1,8 +1,8 @@
 # JS Confuser
 
-JS-Confuser is a JavaScript obfuscation tool to make your programs _impossible_ to read. [Try the web version](https://jsconfuser.com).
+JS-Confuser is a JavaScript obfuscation tool to make your programs _impossible_ to read. [Try the web version](https://master--hungry-shannon-c1ce6b.netlify.app/).
 
-  [![NPM](https://img.shields.io/badge/NPM-%23000000.svg?style=for-the-badge&logo=npm&logoColor=white)](https://npmjs.com/package/js-confuser) [![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)](https://github.com/MichaelXF/js-confuser) [![Netlify](https://img.shields.io/badge/netlify-%23000000.svg?style=for-the-badge&logo=netlify&logoColor=#00C7B7)](https://jsconfuser.com)
+  [![NPM](https://img.shields.io/badge/NPM-%23000000.svg?style=for-the-badge&logo=npm&logoColor=white)](https://npmjs.com/package/js-confuser) [![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)](https://github.com/MichaelXF/js-confuser) [![Netlify](https://img.shields.io/badge/netlify-%23000000.svg?style=for-the-badge&logo=netlify&logoColor=#00C7B7)](https://master--hungry-shannon-c1ce6b.netlify.app/)
 
 ## Key features
 

package/dist/transforms/flatten.js

@@ -224,7 +224,7 @@ class Flatten extends _transform.default {
 
       var call = (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(resultName, (0, _gen.ArrayExpression)([])), (0, _gen.VariableDeclarator)("_", (0, _gen.AssignmentExpression)("=", identifier, (0, _gen.ArrayExpression)([(0, _gen.ArrayExpression)(input.map(_gen.Identifier)), (0, _gen.ArrayExpression)([...newParamNodes]), (0, _gen.Identifier)(resultName)])))]); // result.pop()
 
-      var pop = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), (0, _gen.Identifier)("pop"), false), []); // var result = newFn.call([...refs], ...arguments)
+      var pop = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), (0, _gen.Literal)("pop"), true), []); // var result = newFn.call([...refs], ...arguments)
       // modified1 = result.pop();
       // modified2 = result.pop();
       // ...modifiedN = result.pop();...

package/dist/transforms/identifier/variableAnalysis.js

@@ -103,8 +103,10 @@ class VariableAnalysis extends _transform.default {
         var definingContexts = info.spec.isDefined ? (0, _insert.getAllDefiningContexts)(o, p) : (0, _insert.getReferencingContexts)(o, p, info);
         (0, _assert.ok)(definingContexts.length);
         definingContexts.forEach(definingContext => {
-          (0, _assert.ok)((0, _insert.isContext)(definingContext), "".concat(definingContext.type, " is not a context"));
-
+          // ok(
+          //   isContext(definingContext),
+          //   `${definingContext.type} is not a context`
+          // );
           if (isDefined) {
             // Add to defined Map
             if (!this.defined.has(definingContext)) {

package/dist/transforms/lock/integrity.js

@@ -148,7 +148,7 @@ class Integrity extends _transform.default {
     }
 
     return () => {
-      object.__hiddenCountermeasures = this.lock.getCounterMeasuresCode();
+      object.__hiddenCountermeasures = this.lock.getCounterMeasuresCode(object, parents);
 
       object.$eval = () => {
         var functionName = this.generateIdentifier();
@@ -178,7 +178,11 @@ class Integrity extends _transform.default {
           ifStatement.alternate = (0, _gen.BlockStatement)(object.__hiddenCountermeasures);
         }
 
-        object.body = (0, _gen.BlockStatement)([functionDeclaration, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(hashName, (0, _gen.CallExpression)((0, _insert.clone)(this.hashFn), [(0, _gen.CallExpression)((0, _insert.clone)(this.stringFn), [(0, _gen.Identifier)(functionName)]), (0, _gen.Literal)(this.seed)]))), ifStatement]);
+        object.body = (0, _gen.BlockStatement)([functionDeclaration, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(hashName, (0, _gen.CallExpression)((0, _insert.clone)(this.hashFn), [(0, _gen.CallExpression)((0, _insert.clone)(this.stringFn), [(0, _gen.Identifier)(functionName)]), (0, _gen.Literal)(this.seed)]))), ifStatement]); // Make sure the countermeasures activation variable is present
+
+        if (this.lock.counterMeasuresActivated) {
+          object.body.body.unshift((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.lock.counterMeasuresActivated)));
+        }
 
         if (object.type == "ArrowFunctionExpression") {
           object.type = "FunctionExpression";

package/dist/transforms/lock/lock.js

@@ -43,6 +43,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * Applies browser & date locks.
  */
 class Lock extends _transform.default {
+  /**
+   * This is a boolean variable injected into the source code determining wether the countermeasures function has been called.
+   * This is used to prevent infinite loops from happening
+   */
   constructor(o) {
     super(o, _order.ObfuscateOrder.Lock); // Removed feature
     // if (this.options.lock.startDate && this.options.lock.endDate) {
@@ -55,6 +59,8 @@ class Lock extends _transform.default {
 
     _defineProperty(this, "iosDetectFn", void 0);
 
+    _defineProperty(this, "counterMeasuresActivated", void 0);
+
     _defineProperty(this, "made", void 0);
 
     if (this.options.lock.integrity) {
@@ -70,34 +76,29 @@ class Lock extends _transform.default {
 
   apply(tree) {
     if (typeof this.options.lock.countermeasures === "string" && (0, _compare.isValidIdentifier)(this.options.lock.countermeasures)) {
-      var defined = new Set();
       (0, _traverse.default)(tree, (object, parents) => {
-        if (object.type == "Identifier") {
+        if (object.type == "Identifier" && object.name === this.options.lock.countermeasures) {
           var info = (0, _identifiers.getIdentifierInfo)(object, parents);
 
           if (info.spec.isDefined) {
-            defined.add(object.name);
-
-            if (object.name === this.options.lock.countermeasures) {
-              if (this.counterMeasuresNode) {
-                throw new Error("Countermeasures function was already defined, it must have a unique name from the rest of your code");
-              } else {
-                var definingContext = (0, _insert.getVarContext)(parents[0], parents.slice(1));
-
-                if (definingContext != tree) {
-                  throw new Error("Countermeasures function must be defined at the global level");
-                }
+            if (this.counterMeasuresNode) {
+              throw new Error("Countermeasures function was already defined, it must have a unique name from the rest of your code");
+            } else {
+              var definingContext = (0, _insert.getVarContext)(parents[0], parents.slice(1));
 
-                var chain = [object, parents];
+              if (definingContext != tree) {
+                throw new Error("Countermeasures function must be defined at the global level");
+              }
 
-                if (info.isFunctionDeclaration) {
-                  chain = [parents[0], parents.slice(1)];
-                } else if (info.isVariableDeclaration) {
-                  chain = [parents[1], parents.slice(2)];
-                }
+              var chain = [object, parents];
 
-                this.counterMeasuresNode = chain;
+              if (info.isFunctionDeclaration) {
+                chain = [parents[0], parents.slice(1)];
+              } else if (info.isVariableDeclaration) {
+                chain = [parents[1], parents.slice(2)];
               }
+
+              this.counterMeasuresNode = chain;
             }
           }
         }
@@ -111,7 +112,7 @@ class Lock extends _transform.default {
     super.apply(tree);
   }
 
-  getCounterMeasuresCode() {
+  getCounterMeasuresCode(object, parents) {
     var opt = this.options.lock.countermeasures;
 
     if (opt === false) {
@@ -120,8 +121,13 @@ class Lock extends _transform.default {
 
 
     if (typeof opt === "string") {
-      // Since Lock occurs before variable renaming, we are using the pre-obfuscated function name
-      return [(0, _gen.ExpressionStatement)((0, _gen.CallExpression)((0, _template.default)(opt).single().expression, []))];
+      if (!this.counterMeasuresActivated) {
+        this.counterMeasuresActivated = this.getPlaceholder();
+        (0, _insert.prepend)(parents[parents.length - 1] || object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.counterMeasuresActivated)));
+      } // Since Lock occurs before variable renaming, we are using the pre-obfuscated function name
+
+
+      return [(0, _gen.ExpressionStatement)((0, _gen.LogicalExpression)("||", (0, _gen.Identifier)(this.counterMeasuresActivated), (0, _gen.SequenceExpression)([(0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(this.counterMeasuresActivated), (0, _gen.Literal)(true)), (0, _gen.CallExpression)((0, _template.default)(opt).single().expression, [])])))];
     }
 
     var type = (0, _random.choice)(["crash", "exit"]);
@@ -239,7 +245,7 @@ class Lock extends _transform.default {
           // A very simple mechanism inspired from https://github.com/javascript-obfuscator/javascript-obfuscator/blob/master/src/custom-code-helpers/self-defending/templates/SelfDefendingNoEvalTemplate.ts
           // regExp checks for a newline, formatters add these
           var callExpression = (0, _template.default)("\n            (\n              function(){\n                // Breaks JSNice.org, beautifier.io\n                var namedFunction = function(){\n                  const test = function(){\n                    const regExp=new RegExp('\\n');\n                    return regExp['test'](namedFunction)\n                  };\n                  return test()\n                }\n\n                return namedFunction();\n              }\n            )()\n            ").single().expression;
-          nodes.push((0, _gen.IfStatement)(callExpression, this.getCounterMeasuresCode() || [], null));
+          nodes.push((0, _gen.IfStatement)(callExpression, this.getCounterMeasuresCode(object, parents) || [], null));
           break;
 
         case "nativeFunction":
@@ -270,23 +276,24 @@ class Lock extends _transform.default {
               test = (0, _template.default)("".concat(fn, ".toString().split(\"{ [native code] }\").length <= 1")).single().expression;
             }
 
-            nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode() || [], null));
+            nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode(object, parents) || [], null));
           }
 
           break;
 
         case "startDate":
           test = (0, _gen.BinaryExpression)("<", dateNow, (0, _gen.Literal)(this.getTime(this.options.lock.startDate)));
-          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode() || [], null));
+          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode(object, parents) || [], null));
           break;
 
         case "endDate":
           test = (0, _gen.BinaryExpression)(">", dateNow, (0, _gen.Literal)(this.getTime(this.options.lock.endDate)));
-          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode() || [], null));
+          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode(object, parents) || [], null));
           break;
 
         case "context":
-          var prop = (0, _random.choice)(this.options.lock.context); // Todo: Alternative to `this`
+          var prop = (0, _random.choice)(this.options.lock.context);
+          var code = this.getCounterMeasuresCode(object, parents) || []; // Todo: Alternative to `this`
 
           if (!this.globalVar) {
             offset = 1;
@@ -295,12 +302,13 @@ class Lock extends _transform.default {
           }
 
           test = (0, _gen.UnaryExpression)("!", (0, _gen.MemberExpression)((0, _gen.Identifier)(this.globalVar), (0, _gen.Literal)(prop), true));
-          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode() || [], null));
+          nodes.push((0, _gen.IfStatement)(test, code, null));
           break;
 
         case "osLock":
           var navigatorUserAgent = (0, _template.default)("window.navigator.userAgent.toLowerCase()").single().expression;
           (0, _assert.ok)(this.options.lock.osLock);
+          var code = this.getCounterMeasuresCode(object, parents) || [];
           this.options.lock.osLock.forEach(osName => {
             var agentMatcher = {
               windows: "Win",
@@ -338,7 +346,7 @@ class Lock extends _transform.default {
           });
           test = (0, _gen.UnaryExpression)("!", { ...test
           });
-          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode() || [], null));
+          nodes.push((0, _gen.IfStatement)(test, code, null));
           break;
 
         case "browserLock":
@@ -360,7 +368,7 @@ class Lock extends _transform.default {
           });
           test = (0, _gen.UnaryExpression)("!", { ...test
           });
-          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode() || [], null));
+          nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode(object, parents) || [], null));
           break;
 
         case "domainLock":
@@ -392,7 +400,7 @@ class Lock extends _transform.default {
               test = (0, _gen.LogicalExpression)("||", (0, _gen.BinaryExpression)("==", (0, _gen.UnaryExpression)("typeof", (0, _gen.Identifier)("location")), (0, _gen.Literal)("undefined")), test);
             }
 
-            nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode() || [], null));
+            nodes.push((0, _gen.IfStatement)(test, this.getCounterMeasuresCode(object, parents) || [], null));
           }
 
           break;

package/dist/transforms/minify.js

@@ -53,7 +53,7 @@ class Minify extends _transform.default {
         var earlyReturn = body.length;
         var fnDecs = [];
         body.forEach((stmt, i) => {
-          if (stmt.type == "ReturnStatement" || stmt.type == "BreakStatement" || stmt.type == "ContinueStatement") {
+          if (stmt.type === "ReturnStatement" || stmt.type === "BreakStatement" || stmt.type === "ContinueStatement" || stmt.type === "ThrowStatement") {
             if (earlyReturn > i + 1) {
               earlyReturn = i + 1;
             }
@@ -136,7 +136,7 @@ class Minify extends _transform.default {
               if (!lastDec || lastDec.kind !== x.kind || !lastDec.declarations.length) {
                 lastDec = x;
               } else {
-                lastDec.declarations.push(...x.declarations);
+                lastDec.declarations.push(...(0, _insert.clone)(x.declarations));
                 remove.unshift(i);
               }
             } else {

package/dist/transforms/preparation/preparation.js

@@ -17,8 +17,6 @@ var _identifiers = require("../../util/identifiers");
 
 var _label = _interopRequireDefault(require("../label"));
 
-var _antiDestructuring = _interopRequireDefault(require("../es5/antiDestructuring"));
-
 var _compare = require("../../util/compare");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -179,11 +177,6 @@ class Preparation extends _transform.default {
     this.before.push(new _label.default(o));
     this.before.push(new ExplicitIdentifiers(o));
     this.before.push(new ExplicitDeclarations(o));
-
-    if (this.options.es5) {
-      this.before.push(new _antiDestructuring.default(o));
-    } // this.before.push(new NameConflicts(o));
-
   }
 
   match() {

package/dist/transforms/rgf.js

@@ -25,6 +25,8 @@ var _identifiers = require("../util/identifiers");
 
 var _insert = require("../util/insert");
 
+var _random = require("../util/random");
+
 var _transform = _interopRequireDefault(require("./transform"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -69,13 +71,52 @@ class RGF extends _transform.default {
       var collect = [];
       var queue = [];
       var names = new Map();
+      var referenceSignatures = {};
       var definingNodes = new Map();
       (0, _traverse.walk)(contextObject, contextParents, (object, parents) => {
         if (object !== contextObject && (0, _insert.isFunction)(object) && !object.$requiresEval && !object.async && !object.generator && (0, _insert.getVarContext)(parents[0], parents.slice(1)) === contextObject) {
+          var _this$options$lock;
+
+          // Discard getter/setter methods
+          if (parents[0].type === "Property" && parents[0].value === object) {
+            if (parents[0].method || parents[0].kind === "get" || parents[0].kind === "set") {
+              return;
+            }
+          } // Discard class methods
+
+
+          if (parents[0].type === "MethodDefinition" && parents[0].value === object) {
+            return;
+          } // Avoid applying to the countermeasures function
+
+
+          if (typeof ((_this$options$lock = this.options.lock) === null || _this$options$lock === void 0 ? void 0 : _this$options$lock.countermeasures) === "string") {
+            // function countermeasures(){...}
+            if (object.type === "FunctionDeclaration" && object.id.type === "Identifier" && object.id.name === this.options.lock.countermeasures) {
+              return;
+            } // var countermeasures = function(){...}
+
+
+            if (parents[0].type === "VariableDeclarator" && parents[0].init === object && parents[0].id.type === "Identifier" && parents[0].id.name === this.options.lock.countermeasures) {
+              return;
+            }
+          }
+
           var defined = new Set(),
               referenced = new Set();
           var isBound = false;
-          (0, _traverse.walk)(object.body, [object, ...parents], (o, p) => {
+          /**
+           * The fnTraverses serves two important purposes
+           *
+           * - Identify all the variables referenced and defined here
+           * - Identify is the 'this' keyword is used anywhere
+           *
+           * @param o
+           * @param p
+           * @returns
+           */
+
+          const fnTraverser = (o, p) => {
             if (o.type == "Identifier" && !_constants.reservedIdentifiers.has(o.name) && !this.options.globalVariables.has(o.name)) {
               var info = (0, _identifiers.getIdentifierInfo)(o, p);
 
@@ -83,7 +124,7 @@ class RGF extends _transform.default {
                 return;
               }
 
-              if (info.spec.isDefined) {
+              if (info.spec.isDefined && (0, _insert.getDefiningContext)(o, p) === object) {
                 defined.add(o.name);
               } else {
                 referenced.add(o.name);
@@ -93,7 +134,10 @@ class RGF extends _transform.default {
             if (o.type == "ThisExpression" || o.type == "Super") {
               isBound = true;
             }
-          });
+          };
+
+          (0, _traverse.walk)(object.params, [object, ...parents], fnTraverser);
+          (0, _traverse.walk)(object.body, [object, ...parents], fnTraverser);
 
           if (!isBound) {
             var _object$id;
@@ -159,6 +203,7 @@ class RGF extends _transform.default {
           if (object.type == "FunctionDeclaration" && typeof object.id.name === "string") {
             var index = names.size;
             names.set(object.id.name, index);
+            referenceSignatures[index] = (0, _random.getRandomString)(10);
             definingNodes.set(object.id.name, object.id);
           }
         }
@@ -166,9 +211,10 @@ class RGF extends _transform.default {
 
       if (!queue.length) {
         return;
-      }
+      } // An array containing all the function declarations
+
 
-      var referenceArray = this.generateIdentifier();
+      var referenceArray = "_" + (0, _random.getRandomString)(10);
       (0, _traverse.walk)(contextObject, contextParents, (o, p) => {
         if (o.type == "Identifier" && !_constants.reservedIdentifiers.has(o.name)) {
           var index = names.get(o.name);
@@ -185,7 +231,19 @@ class RGF extends _transform.default {
 
                 if (pointingTo == shouldBe) {
                   this.log(o.name, "->", "".concat(referenceArray, "[").concat(index, "]"));
-                  this.replace(o, (0, _gen.FunctionExpression)([], [(0, _gen.ReturnStatement)((0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(referenceArray), (0, _gen.Literal)(index), true), [(0, _gen.Identifier)(referenceArray), (0, _gen.SpreadElement)((0, _gen.Identifier)("arguments"))]))]));
+                  var memberExpression = (0, _gen.MemberExpression)((0, _gen.Identifier)(referenceArray), (0, _gen.Literal)(index), true); // Allow re-assignment to the RGF function
+
+                  if (p[0] && p[0].type === "AssignmentExpression" && p[0].left === o) {
+                    // fn = ...
+                    this.replace(o, memberExpression);
+                  } else {
+                    // fn()
+                    // fn
+                    // In most cases the identifier is being used like this (call expression, or referenced to be called later)
+                    // Replace it with a simple wrapper function that will pass on the reference array
+                    var conditionalExpression = (0, _gen.ConditionalExpression)((0, _template.default)("typeof ".concat(referenceArray, "[").concat(index, "] === \"function\" && ").concat(referenceArray, "[").concat(index, "][\"").concat(referenceSignatures[index] || "_", "\"]")).single().expression, (0, _gen.FunctionExpression)([], [(0, _gen.ReturnStatement)((0, _gen.CallExpression)(memberExpression, [(0, _gen.Identifier)(referenceArray), (0, _gen.SpreadElement)((0, _gen.Identifier)("arguments"))]))]), memberExpression);
+                    this.replace(o, conditionalExpression);
+                  }
                 }
               }
             }
@@ -202,6 +260,7 @@ class RGF extends _transform.default {
         var name = object === null || object === void 0 ? void 0 : (_object$id2 = object.id) === null || _object$id2 === void 0 ? void 0 : _object$id2.name;
         var hasName = !!name;
         var params = object.params.map(x => x.name) || [];
+        var signature = referenceSignatures[names.get(name)];
         var embeddedName = name || this.getPlaceholder(); // Since `new Function` is completely isolated, create an entire new obfuscator and run remaining transformations.
         // RGF runs early and needs completed code before converting to a string.
         // (^ the variables haven't been renamed yet)
@@ -222,7 +281,7 @@ class RGF extends _transform.default {
         };
         var tree = {
           type: "Program",
-          body: [embeddedFunction, (0, _gen.ReturnStatement)((0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(embeddedName), (0, _gen.Identifier)("call"), false), [(0, _gen.ThisExpression)(), (0, _gen.SpreadElement)((0, _template.default)("Array.prototype.slice.call(arguments, 1)").single().expression)]))]
+          body: [embeddedFunction, (0, _gen.ReturnStatement)((0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(embeddedName), (0, _gen.Literal)("call"), true), [(0, _gen.Identifier)("undefined"), (0, _gen.SpreadElement)((0, _template.default)("Array.prototype.slice.call(arguments, 1)").single().expression)]))]
         };
         tree.__hiddenDeclarations = (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(referenceArray));
         tree.__hiddenDeclarations.hidden = true;
@@ -241,8 +300,17 @@ class RGF extends _transform.default {
         var toString = (0, _compiler.compileJsSync)(tree, this.options);
         var newFunction = (0, _gen.NewExpression)((0, _gen.Identifier)("Function"), [(0, _gen.Literal)(referenceArray), (0, _gen.Literal)(toString)]);
 
-        if (hasName) {
-          arrayExpression.elements[names.get(name)] = newFunction;
+        function applySignature(fn) {
+          if (!signature) {
+            return fn;
+          } // This code marks the function object with a unique property
+
+
+          return (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)("fn", fn)), (0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.MemberExpression)((0, _gen.Identifier)("fn"), (0, _gen.Literal)(signature), true), (0, _gen.Literal)(true))), (0, _gen.ReturnStatement)((0, _gen.Identifier)("fn"))]), []);
+        }
+
+        if (object.type === "FunctionDeclaration") {
+          arrayExpression.elements[names.get(name)] = applySignature(newFunction);
 
           if (Array.isArray(parents[0])) {
             parents[0].splice(parents[0].indexOf(object), 1);
@@ -250,7 +318,9 @@ class RGF extends _transform.default {
             this.error(new Error("Error deleting function declaration: " + parents.map(x => x.type).join(",")));
           }
         } else {
-          this.replace(object, newFunction);
+          // The wrapper function passes the reference array around
+          var wrapperFunction = (0, _gen.FunctionExpression)([], [(0, _gen.ReturnStatement)((0, _gen.CallExpression)((0, _gen.MemberExpression)(newFunction, (0, _gen.Literal)("call"), true), [(0, _gen.Identifier)("undefined"), (0, _gen.Identifier)(referenceArray), (0, _gen.SpreadElement)((0, _gen.Identifier)("arguments"))]))]);
+          this.replace(object, applySignature(wrapperFunction));
         }
       });
     };

package/dist/transforms/string/stringSplitting.js

@@ -45,28 +45,8 @@ class StringSplitting extends _transform.default {
     this.vars = [];
   }
 
-  apply(tree) {
-    super.apply(tree);
-
-    if (this.vars.length) {
-      (0, _random.shuffle)(this.adders);
-      (0, _random.shuffle)(this.vars);
-      var body = tree.body;
-      this.adders.forEach(nodes => {
-        nodes.forEach(x => body.unshift(x));
-      });
-      var variableDeclaration = {
-        type: "VariableDeclaration",
-        declarations: [],
-        kind: "var"
-      };
-      this.vars.forEach(node => variableDeclaration.declarations.push(node));
-      body.unshift(variableDeclaration);
-    }
-  }
-
   match(object, parents) {
-    return object.type == "Literal" && typeof object.value === "string" && !(0, _stringConcealing.isModuleSource)(object, parents) && !(0, _compare.isDirective)(object, parents);
+    return object.type == "Literal" && typeof object.value === "string" && object.value.length >= 8 && !(0, _stringConcealing.isModuleSource)(object, parents) && !(0, _compare.isDirective)(object, parents);
   }
 
   transform(object, parents) {
@@ -92,7 +72,6 @@ class StringSplitting extends _transform.default {
       var last = chunks.pop();
       chunks.forEach((chunk, i) => {
         if (i == 0) {
-          (0, _assert.ok)(i == 0);
           parent = binaryExpression = (0, _gen.BinaryExpression)("+", (0, _gen.Literal)(chunk), (0, _gen.Literal)(""));
         } else {
           binaryExpression.left = (0, _gen.BinaryExpression)("+", (0, _insert.clone)(binaryExpression.left), (0, _gen.Literal)(chunk));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-confuser",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "JavaScript Obfuscation Tool.",
   "main": "dist/index.js",
   "types": "index.d.ts",
@@ -45,7 +45,7 @@
   "bugs": {
     "url": "https://github.com/MichaelXF/js-confuser/issues"
   },
-  "homepage": "https://jsconfuser.com",
+  "homepage": "https://master--hungry-shannon-c1ce6b.netlify.app/",
   "jest": {
     "coverageReporters": [
       "html"

package/src/transforms/flatten.ts

@@ -328,8 +328,8 @@ export default class Flatten extends Transform {
       var pop = CallExpression(
         MemberExpression(
           MemberExpression(Identifier(resultName), Identifier(propName), false),
-          Identifier("pop"),
-          false
+          Literal("pop"),
+          true
         ),
         []
       );

package/src/transforms/identifier/variableAnalysis.ts

@@ -93,10 +93,10 @@ export default class VariableAnalysis extends Transform {
         ok(definingContexts.length);
 
         definingContexts.forEach((definingContext) => {
-          ok(
-            isContext(definingContext),
-            `${definingContext.type} is not a context`
-          );
+          // ok(
+          //   isContext(definingContext),
+          //   `${definingContext.type} is not a context`
+          // );
 
           if (isDefined) {
             // Add to defined Map

package/src/transforms/lock/integrity.ts

@@ -195,7 +195,10 @@ export default class Integrity extends Transform {
     }
 
     return () => {
-      object.__hiddenCountermeasures = this.lock.getCounterMeasuresCode();
+      object.__hiddenCountermeasures = this.lock.getCounterMeasuresCode(
+        object,
+        parents
+      );
 
       object.$eval = () => {
         var functionName = this.generateIdentifier();
@@ -258,6 +261,15 @@ export default class Integrity extends Transform {
           ifStatement,
         ]);
 
+        // Make sure the countermeasures activation variable is present
+        if (this.lock.counterMeasuresActivated) {
+          object.body.body.unshift(
+            VariableDeclaration(
+              VariableDeclarator(this.lock.counterMeasuresActivated)
+            )
+          );
+        }
+
         if (object.type == "ArrowFunctionExpression") {
           object.type = "FunctionExpression";
           object.expression = false;