js-confuser 2.0.0-alpha.2 → 2.0.0-alpha.3

package/dist/transforms/deadCode.js

@@ -7,12 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _randomUtils = require("../utils/random-utils");
 var _deadCodeTemplates = require("../templates/deadCodeTemplates");
-var _probability = require("../probability");
 var _order = require("../order");
 var t = _interopRequireWildcard(require("@babel/types"));
 var _template = _interopRequireDefault(require("../templates/template"));
-var _NameGen = require("../utils/NameGen");
 var _astUtils = require("../utils/ast-utils");
+var _PredicateGen = _interopRequireDefault(require("../utils/PredicateGen"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -30,6 +29,7 @@ var _default = exports["default"] = function _default(_ref) {
     }
   });
   var created = 0;
+  var predicateGen = new _PredicateGen["default"](me);
   return {
     visitor: {
       Block: {
@@ -37,7 +37,7 @@ var _default = exports["default"] = function _default(_ref) {
           if (blockPath.find(function (p) {
             return me.isSkipped(p);
           })) return;
-          if (!(0, _probability.computeProbabilityMap)(me.options.deadCode)) {
+          if (!me.computeProbabilityMap(me.options.deadCode)) {
             return;
           }
           if (typeof me.options.deadCode !== "function") {
@@ -52,19 +52,12 @@ var _default = exports["default"] = function _default(_ref) {
           var template = (0, _randomUtils.choice)(_deadCodeTemplates.deadCodeTemplates);
           var nodes = template.compile();
           var containingFnName = me.getPlaceholder("dead_" + created);
-          var newPath = blockPath.unshiftContainer("body", t.functionDeclaration(t.identifier(containingFnName), [], t.blockStatement(_toConsumableArray(nodes))));
 
-          // Overcomplicated way to get a random property name that doesn't exist on the Function
-          var randomProperty;
-          var nameGen = new _NameGen.NameGen("randomized");
-          function PrototypeCollision() {}
-          PrototypeCollision(); // Call it for code coverage :D
-
-          do {
-            randomProperty = nameGen.generate();
-          } while (!randomProperty || PrototypeCollision[randomProperty] !== undefined);
-          me.changeData.deadCode++;
-          (0, _astUtils.prepend)(blockPath, new _template["default"]("\n              if(\"".concat(randomProperty, "\" in ").concat(containingFnName, ") {\n                ").concat(containingFnName, "()\n              }\n              ")).single());
+          // Insert dummy function
+          (0, _astUtils.prepend)(blockPath, t.functionDeclaration(t.identifier(containingFnName), [], t.blockStatement(_toConsumableArray(nodes))));
+          (0, _astUtils.prepend)(blockPath, new _template["default"]("\n              if({falsePredicate}) {\n                ".concat(containingFnName, "()\n              }\n              ")).single({
+            falsePredicate: predicateGen.generateFalseExpression(blockPath)
+          }));
           me.skip(blockPath);
         }
       }

package/dist/transforms/dispatcher.js

@@ -9,7 +9,6 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _template = _interopRequireDefault(require("../templates/template"));
 var _assert = require("assert");
 var _randomUtils = require("../utils/random-utils");
-var _probability = require("../probability");
 var _order = require("../order");
 var _constants = require("../constants");
 var _functionUtils = require("../utils/function-utils");
@@ -148,7 +147,7 @@ var _default = exports["default"] = function _default(_ref) {
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               var name = _step2.value;
-              if (!(0, _probability.computeProbabilityMap)(me.options.dispatcher, name)) {
+              if (!me.computeProbabilityMap(me.options.dispatcher, name)) {
                 functionPaths["delete"](name);
               }
             }

package/dist/transforms/extraction/duplicateLiteralsRemoval.js

@@ -40,6 +40,11 @@ var _default = exports["default"] = function _default(_ref) {
           programPath.traverse({
             "StringLiteral|BooleanLiteral|NumericLiteral|NullLiteral|Identifier": function StringLiteralBooleanLiteralNumericLiteralNullLiteralIdentifier(_path) {
               var literalPath = _path;
+
+              // Don't change module imports
+              if (literalPath.isStringLiteral()) {
+                if ((0, _astUtils.isModuleImport)(literalPath)) return;
+              }
               var node = literalPath.node;
               var isUndefined = false;
               if (literalPath.isIdentifier()) {

package/dist/transforms/extraction/objectExtraction.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 var _order = require("../../order");
 var t = _interopRequireWildcard(require("@babel/types"));
 var _astUtils = require("../../utils/ast-utils");
-var _probability = require("../../probability");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -134,7 +133,7 @@ var _default = exports["default"] = function _default(_ref) {
 
         // Object references are too complex to safely extract
         if (!isObjectSafe) return;
-        if (!(0, _probability.computeProbabilityMap)(me.options.objectExtraction, identifier.node.name)) return;
+        if (!me.computeProbabilityMap(me.options.objectExtraction, identifier.node.name)) return;
         var newDeclarationKind = varDecPath.node.kind === "const" ? "let" : varDecPath.node.kind;
         varDecPath.replaceWithMultiple(newDeclarations.map(function (declaration) {
           return t.variableDeclaration(newDeclarationKind, [declaration]);

package/dist/transforms/finalizer.js

@@ -40,7 +40,7 @@ var _default = exports["default"] = function _default(_ref) {
       }
     }), {}, {
       // Hexadecimal numbers
-      NumberLiteral: {
+      NumericLiteral: {
         exit: function exit(path) {
           if (me.options.hexadecimalNumbers) {
             var value = path.node.value;

package/dist/transforms/flatten.js

@@ -7,11 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _astUtils = require("../utils/ast-utils");
-var _probability = require("../probability");
 var _order = require("../order");
 var _constants = require("../constants");
 var _functionUtils = require("../utils/function-utils");
-var _assert = require("assert");
 var _NameGen = require("../utils/NameGen");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -59,7 +57,7 @@ var _default = exports["default"] = function _default(_ref) {
     if (!t.isValidIdentifier(functionName, true)) {
       functionName = "anonymous";
     }
-    if (!(0, _probability.computeProbabilityMap)(me.options.flatten, functionName)) {
+    if (!me.computeProbabilityMap(me.options.flatten, functionName)) {
       return;
     }
     var strictMode = fnPath.find(function (path) {
@@ -99,22 +97,7 @@ var _default = exports["default"] = function _default(_ref) {
           if (!binding) {
             return;
           }
-          var definedLocal = identifierPath.scope;
-          do {
-            if (definedLocal.hasOwnBinding(identifierName)) return;
-            if (definedLocal === fnPath.scope) break;
-            definedLocal = definedLocal.parent;
-            if (definedLocal === program.scope) (0, _assert.ok)(functionName + ":" + identifierName);
-          } while (definedLocal);
-          var cursor = fnPath.scope.parent;
-          var isOutsideVariable = false;
-          do {
-            if (cursor.hasBinding(identifierName)) {
-              isOutsideVariable = true;
-              break;
-            }
-            cursor = cursor.parent;
-          } while (cursor);
+          var isOutsideVariable = fnPath.scope.parent.getBinding(identifierName) === binding;
           if (!isOutsideVariable) {
             return;
           }

package/dist/transforms/identifier/globalConcealing.js

@@ -9,7 +9,6 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _NameGen = require("../../utils/NameGen");
 var _template = _interopRequireDefault(require("../../templates/template"));
 var _order = require("../../order");
-var _probability = require("../../probability");
 var _constants = require("../../constants");
 var _astUtils = require("../../utils/ast-utils");
 var _getGlobalTemplate = require("../../templates/getGlobalTemplate");
@@ -110,7 +109,7 @@ var _default = exports["default"] = function _default(_ref) {
               var mapping = globalMapping.get(globalName);
               if (!mapping) {
                 // Allow user to disable custom global variables
-                if (!(0, _probability.computeProbabilityMap)(me.options.globalConcealing, globalName)) continue;
+                if (!me.computeProbabilityMap(me.options.globalConcealing, globalName)) continue;
                 mapping = gen.generate();
                 globalMapping.set(globalName, mapping);
               }

package/dist/transforms/identifier/movedDeclarations.js

@@ -60,9 +60,11 @@ var _default = exports["default"] = function _default(_ref) {
             return path.isFunction();
           });
           if (!functionPath || !functionPath.node[_constants.PREDICTABLE]) return;
+          var fnBody = functionPath.get("body");
+          if (!fnBody.isBlockStatement()) return;
 
           // Must be direct child of the function
-          if (path.parentPath !== functionPath.get("body")) return;
+          if (path.parentPath !== fnBody) return;
           var functionName = path.node.id.name;
 
           // Must be eligible for parameter packing
@@ -85,7 +87,7 @@ var _default = exports["default"] = function _default(_ref) {
             binding.path = paramPath;
             binding.identifier = identifier;
           }
-          (0, _astUtils.prepend)(functionPath, new _template["default"]("\n              if(!".concat(functionName, ") {\n                ").concat(functionName, " = {functionExpression};\n              }\n              ")).single({
+          (0, _astUtils.prepend)(fnBody, new _template["default"]("\n              if(!".concat(functionName, ") {\n                ").concat(functionName, " = {functionExpression};\n              }\n              ")).single({
             functionExpression: functionExpression
           }));
           path.remove();
@@ -94,6 +96,7 @@ var _default = exports["default"] = function _default(_ref) {
       },
       VariableDeclaration: {
         exit: function exit(path) {
+          if (me.isSkipped(path)) return;
           if (path.node.kind !== "var") return;
           if (path.node.declarations.length !== 1) return;
           var insertionMethod = "variableDeclaration";
@@ -125,7 +128,9 @@ var _default = exports["default"] = function _default(_ref) {
           var isDefinedAtTop = false;
           var parentPath = path.parentPath;
           if (parentPath.isBlock()) {
-            isDefinedAtTop = parentPath.get("body").indexOf(path) === 0;
+            isDefinedAtTop = parentPath.get("body").filter(function (x) {
+              return x.type !== "ImportDeclaration";
+            }).indexOf(path) === 0;
           }
 
           // Already at the top - nothing will change
@@ -167,13 +172,15 @@ var _default = exports["default"] = function _default(_ref) {
               var block = path.findParent(function (path) {
                 return path.isBlock();
               });
-              var topNode = block.node.body[0];
+              var topNode = block.node.body.filter(function (x) {
+                return x.type !== "ImportDeclaration";
+              })[0];
               var variableDeclarator = t.variableDeclarator(t.identifier(name));
               if (t.isVariableDeclaration(topNode) && topNode.kind === "var") {
                 topNode.declarations.push(variableDeclarator);
                 break;
               } else {
-                block.node.body.unshift(t.variableDeclaration("var", [variableDeclarator]));
+                (0, _astUtils.prepend)(block, me.skip(t.variableDeclaration("var", [variableDeclarator])));
               }
               me.changeData.variableDeclarations++;
               break;

package/dist/transforms/identifier/renameVariables.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _order = require("../../order");
 var _constants = require("../../constants");
-var _probability = require("../../probability");
 var _astUtils = require("../../utils/ast-utils");
 var _functionUtils = require("../../utils/function-utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -211,16 +210,18 @@ var _default = exports["default"] = function _default(_ref) {
 
         // Placeholder variables should always be renamed
         if (name.startsWith(_constants.placeholderVariablePrefix)) return true;
-
-        // Do not rename exports
-        if ((0, _astUtils.isExportedIdentifier)(bindings === null || bindings === void 0 ? void 0 : bindings.get(name))) return false;
+        var binding = bindings === null || bindings === void 0 ? void 0 : bindings.get(name);
+        if (binding) {
+          // Do not rename exports
+          if ((0, _astUtils.isExportedIdentifier)(binding)) return false;
+        }
         if (name === me.obfuscator.getStringCompressionLibraryName()) return false;
 
         // Global variables are additionally checked against user option
         if (isGlobal) {
-          if (!(0, _probability.computeProbabilityMap)(me.options.renameGlobals, name)) return false;
+          if (!me.computeProbabilityMap(me.options.renameGlobals, name)) return false;
         }
-        if (!(0, _probability.computeProbabilityMap)(me.options.renameVariables, name, isGlobal)) return false;
+        if (!me.computeProbabilityMap(me.options.renameVariables, name, isGlobal)) return false;
         return true;
       }
 

package/dist/transforms/lock/lock.js

@@ -14,7 +14,6 @@ var _integrity = require("./integrity");
 var _integrityTemplate = require("../../templates/integrityTemplate");
 var _constants = require("../../constants");
 var _tamperProtectionTemplates = require("../../templates/tamperProtectionTemplates");
-var _probability = require("../../probability");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -33,12 +32,20 @@ var _default = exports["default"] = function _default(_ref) {
     }
   });
   if (me.options.lock.startDate instanceof Date) {
+    // Ensure date is in the past
+    if (me.options.lock.startDate.getTime() > Date.now()) {
+      me.warn("lock.startDate is detected to be in the future");
+    }
     me.options.lock.customLocks.push({
       code: ["\n      if(Date.now()<".concat(me.options.lock.startDate.getTime(), ") {\n        {countermeasures}\n      }\n      "), "\n      if((new Date()).getTime()<".concat(me.options.lock.startDate.getTime(), ") {\n        {countermeasures}\n      }\n      ")],
       percentagePerBlock: 0.5
     });
   }
   if (me.options.lock.endDate instanceof Date) {
+    // Ensure date is in the future
+    if (me.options.lock.endDate.getTime() < Date.now()) {
+      me.warn("lock.endDate is detected to be in the past");
+    }
     me.options.lock.customLocks.push({
       code: ["\n      if(Date.now()>".concat(me.options.lock.endDate.getTime(), ") {\n        {countermeasures}\n      }\n      "), "\n      if((new Date()).getTime()>".concat(me.options.lock.endDate.getTime(), ") {\n        {countermeasures}\n      }\n      ")],
       percentagePerBlock: 0.5
@@ -257,7 +264,7 @@ var _default = exports["default"] = function _default(_ref) {
           if (me.options.lock.countermeasures && functionName === me.options.lock.countermeasures) return;
           // Don't apply to invokeCountermeasures function (Intended)
           if (me.obfuscator.isInternalVariable(functionName)) return;
-          if (!(0, _probability.computeProbabilityMap)(me.options.lock.integrity, functionName)) return;
+          if (!me.computeProbabilityMap(me.options.lock.integrity, functionName)) return;
           var newFnName = me.getPlaceholder();
           var newFunctionDeclaration = t.functionDeclaration(t.identifier(newFnName), funcDecPath.node.params, funcDecPath.node.body);
 

package/dist/transforms/minify.js

@@ -125,6 +125,16 @@ var _default = exports["default"] = function _default(_ref) {
           }
         }
       },
+      // "a" + "b" -> "ab"
+      BinaryExpression: {
+        exit: function exit(path) {
+          if (path.node.operator !== "+") return;
+          var left = path.get("left");
+          var right = path.get("right");
+          if (!left.isStringLiteral() || !right.isStringLiteral()) return;
+          path.replaceWith(t.stringLiteral(left.node.value + right.node.value));
+        }
+      },
       // a["key"] -> a.key
       MemberExpression: {
         exit: function exit(path) {
@@ -204,7 +214,7 @@ var _default = exports["default"] = function _default(_ref) {
       FunctionDeclaration: {
         exit: function exit(path) {
           var id = path.get("id");
-          if (id.isIdentifier() && !id.node.name.startsWith(_constants.placeholderVariablePrefix)) {
+          if (id.isIdentifier() && !id.node.name.startsWith(_constants.placeholderVariablePrefix) && !path.node[_constants.NO_REMOVE]) {
             var binding = path.scope.getBinding(id.node.name);
             if (binding && binding.constantViolations.length === 0 && binding.referencePaths.length === 0 && !binding.referenced) {
               path.remove();
@@ -255,6 +265,9 @@ var _default = exports["default"] = function _default(_ref) {
             // Do not remove variables in unsafe functions
             var fn = (0, _astUtils.getParentFunctionOrProgram)(path);
             if (fn.node[_constants.UNSAFE]) return;
+
+            // Node explicitly marked as not to be removed
+            if (id[_constants.NO_REMOVE]) return;
             var binding = path.scope.getBinding(id.node.name);
             if (binding && binding.constantViolations.length === 0 && binding.referencePaths.length === 0) {
               if (!init.node || init.isPure()) {

package/dist/transforms/opaquePredicates.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _order = require("../order");
 var t = _interopRequireWildcard(require("@babel/types"));
-var _astUtils = require("../utils/ast-utils");
 var _randomUtils = require("../utils/random-utils");
-var _probability = require("../probability");
+var _PredicateGen = _interopRequireDefault(require("../utils/PredicateGen"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var _default = exports["default"] = function _default(_ref) {
@@ -19,10 +19,9 @@ var _default = exports["default"] = function _default(_ref) {
       opaquePredicates: 0
     }
   });
+  var predicateGen = new _PredicateGen["default"](me);
   function createTruePredicate(path) {
-    var controlObject = me.getControlObject((0, _astUtils.getBlock)(path));
-    var trueValue = controlObject.createTruePredicate();
-    return trueValue;
+    return predicateGen.generateTrueExpression(path);
   }
   var active = true;
   var transformCount = 0;
@@ -31,7 +30,7 @@ var _default = exports["default"] = function _default(_ref) {
     if (path.find(function (p) {
       return me.isSkipped(p);
     })) return false;
-    if (!(0, _probability.computeProbabilityMap)(me.options.opaquePredicates)) return false;
+    if (!me.computeProbabilityMap(me.options.opaquePredicates)) return false;
     transformCount++;
     var depth = path.getAncestry().length;
     return (0, _randomUtils.chance)(1000 - transformCount - depth * 100);

package/dist/transforms/pack.js

@@ -61,7 +61,12 @@ function pack(_ref) {
           if (_constants.reservedIdentifiers.has(identifierName)) return;
           if (me.obfuscator.options.globalVariables.has(identifierName)) return;
           if (identifierName === _constants.variableFunctionName) return;
+          if (identifierName === _objectName) return;
           if (!path.scope.hasGlobal(identifierName)) return;
+          if (path.scope.hasBinding(identifierName)) return;
+
+          // Check user's custom implementation
+          if (!me.computeProbabilityMap(me.options.pack, identifierName)) return;
           if (path.key === "argument" && path.parentPath.isUnaryExpression({
             operator: "typeof"
           })) {

package/dist/transforms/plugin.js

@@ -9,10 +9,7 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _constants = require("../constants");
 var _setFunctionLengthTemplate = require("../templates/setFunctionLengthTemplate");
 var _astUtils = require("../utils/ast-utils");
-var _ControlObject = _interopRequireDefault(require("../utils/ControlObject"));
-var _assert = require("assert");
 var _node = require("../utils/node");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -28,6 +25,7 @@ var PluginInstance = exports.PluginInstance = /*#__PURE__*/function () {
     _defineProperty(this, "changeData", {});
     this.pluginOptions = pluginOptions;
     this.obfuscator = obfuscator;
+    this.computeProbabilityMap = obfuscator.computeProbabilityMap.bind(this.obfuscator);
   }
   return _createClass(PluginInstance, [{
     key: "name",
@@ -78,21 +76,25 @@ var PluginInstance = exports.PluginInstance = /*#__PURE__*/function () {
     value: function setFunctionLength(path, originalLength) {
       path.node[_constants.FN_LENGTH] = originalLength;
 
-      // Function length
-      if (this.options.preserveFunctionLength && originalLength > 0) {
-        if (!this.setFunctionLengthName) {
-          this.setFunctionLengthName = this.getPlaceholder("fnLength");
-          this.skip((0, _astUtils.prependProgram)(path, _setFunctionLengthTemplate.SetFunctionLengthTemplate.compile({
-            fnName: this.setFunctionLengthName
-          })));
-        }
-        if (t.isFunctionDeclaration(path.node)) {
-          (0, _astUtils.prepend)(path.parentPath, t.expressionStatement(t.callExpression(t.identifier(this.setFunctionLengthName), [t.identifier(path.node.id.name), (0, _node.numericLiteral)(originalLength)])));
-        } else if (t.isFunctionExpression(path.node) || t.isArrowFunctionExpression(path.node)) {
-          path.replaceWith(t.callExpression(t.identifier(this.setFunctionLengthName), [path.node, (0, _node.numericLiteral)(originalLength)]));
-        } else {
-          // TODO
-        }
+      // Skip if user disabled this feature
+      if (!this.options.preserveFunctionLength) return;
+
+      // Skip if function has no parameters
+      if (originalLength === 0) return;
+
+      // Create the function length setter if it doesn't exist
+      if (!this.setFunctionLengthName) {
+        this.setFunctionLengthName = this.getPlaceholder("fnLength");
+        this.skip((0, _astUtils.prependProgram)(path, _setFunctionLengthTemplate.SetFunctionLengthTemplate.compile({
+          fnName: this.setFunctionLengthName
+        })));
+      }
+      if (t.isFunctionDeclaration(path.node)) {
+        (0, _astUtils.prepend)(path.parentPath, t.expressionStatement(t.callExpression(t.identifier(this.setFunctionLengthName), [t.identifier(path.node.id.name), (0, _node.numericLiteral)(originalLength)])));
+      } else if (t.isFunctionExpression(path.node) || t.isArrowFunctionExpression(path.node)) {
+        path.replaceWith(t.callExpression(t.identifier(this.setFunctionLengthName), [path.node, (0, _node.numericLiteral)(originalLength)]));
+      } else {
+        // TODO
       }
     }
 
@@ -110,27 +112,6 @@ var PluginInstance = exports.PluginInstance = /*#__PURE__*/function () {
       return "__p_" + (0, _randomUtils.getRandomString)(4) + (suffix ? "_" + suffix : "");
     }
 
-    /**
-     * Retrieves (or creates) a `ControlObject` for the given `blockPath`.
-     */
-  }, {
-    key: "getControlObject",
-    value: function getControlObject(blockPath) {
-      var createMultiple = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      (0, _assert.ok)(blockPath.isBlock());
-      var controlObjects = blockPath.node[_constants.CONTROL_OBJECTS];
-      if (!controlObjects) {
-        controlObjects = [];
-      }
-      if (controlObjects.length === 0 || createMultiple && (0, _randomUtils.chance)(controlObjects[0].propertyNames.size - 15 * controlObjects.length)) {
-        var newControlObject = new _ControlObject["default"](this, blockPath);
-        controlObjects.push(newControlObject);
-        blockPath.node[_constants.CONTROL_OBJECTS] = controlObjects;
-        return newControlObject;
-      }
-      return (0, _randomUtils.choice)(controlObjects);
-    }
-
     /**
      * Logs a message to the console, only if `verbose` is enabled.
      * @param messages

package/dist/transforms/renameLabels.js

@@ -9,7 +9,6 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _order = require("../order");
 var _NameGen = require("../utils/NameGen");
 var _assert = require("assert");
-var _probability = require("../probability");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -91,7 +90,7 @@ function _default(_ref) {
           var isRequired = labelInterface.required;
           if (isRequired) {
             var newName = labelInterface.label;
-            if ((0, _probability.computeProbabilityMap)(me.options.renameLabels, labelInterface.label)) {
+            if (me.computeProbabilityMap(me.options.renameLabels, labelInterface.label)) {
               newName = nameGen.generate();
             }
             labelInterface.renamed = newName;

package/dist/transforms/rgf.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 var _order = require("../order");
 var t = _interopRequireWildcard(require("@babel/types"));
 var _obfuscator = _interopRequireDefault(require("../obfuscator"));
-var _probability = require("../probability");
 var _astUtils = require("../utils/ast-utils");
 var _constants = require("../constants");
 var _functionUtils = require("../utils/function-utils");
@@ -18,6 +17,8 @@ var _tamperProtectionTemplates = require("../templates/tamperProtectionTemplates
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+var RGF_ELIGIBLE = Symbol("rgfEligible");
+
 /**
  * RGF (Runtime-Generated-Function) uses the `new Function("code")` syntax to create executable code from strings.
  *
@@ -58,19 +59,26 @@ var _default = exports["default"] = function _default(_ref) {
         }
       },
       "FunctionDeclaration|FunctionExpression": {
-        exit: function exit(_path) {
+        enter: function enter(_path) {
           var _me$options$lock;
           if (!active) return;
+
+          // On enter, determine if Function is eligible for RGF transformation
+
           var path = _path;
           if (me.isSkipped(path)) return;
 
+          // Skip nested functions if the parent function is already deemed eligible
+          if (path.find(function (p) {
+            return p.node[RGF_ELIGIBLE] || p.node[_constants.MULTI_TRANSFORM];
+          })) return;
+
           // Skip async and generator functions
           if (path.node.async || path.node.generator) return;
           var name = (0, _astUtils.getFunctionName)(path);
           if (name === ((_me$options$lock = me.options.lock) === null || _me$options$lock === void 0 ? void 0 : _me$options$lock.countermeasures)) return;
           if (me.obfuscator.isInternalVariable(name)) return;
-          me.log(name);
-          if (!(0, _probability.computeProbabilityMap)(me.options.rgf, name, path.getFunctionParent() === null)) return;
+          if (!me.computeProbabilityMap(me.options.rgf, name, path.getFunctionParent() === null)) return;
 
           // Skip functions with references to outside variables
           // Check the scope to see if this function relies on any variables defined outside the function
@@ -86,13 +94,12 @@ var _default = exports["default"] = function _default(_ref) {
               if (me.options.globalVariables.has(name)) return;
               var binding = idPath.scope.getBinding(name);
               if (!binding) {
-                identifierPreventingTransform = name;
-                idPath.stop();
+                // Global variables are allowed
                 return;
               }
-
+              var isOutsideVariable = path.scope.parent.getBinding(name) === binding;
               // If the binding is not in the current scope, it is an outside reference
-              if (binding.scope !== path.scope) {
+              if (isOutsideVariable) {
                 identifierPreventingTransform = name;
                 idPath.stop();
               }
@@ -102,14 +109,24 @@ var _default = exports["default"] = function _default(_ref) {
             me.log("Skipping function " + name + " due to reference to outside variable: " + identifierPreventingTransform);
             return;
           }
+          me.log("Function " + name + " is eligible for RGF transformation");
+          path.node[RGF_ELIGIBLE] = true;
+        },
+        exit: function exit(_path) {
+          if (!active) return;
+          var path = _path;
+          if (me.isSkipped(path)) return;
+
+          // Function is not eligible for RGF transformation
+          if (!path.node[RGF_ELIGIBLE]) return;
           var embeddedName = me.getPlaceholder() + "_embedded";
           var replacementName = me.getPlaceholder() + "_replacement";
-          var thisName = me.getPlaceholder() + "_this";
+          var argumentsName = me.getPlaceholder() + "_args";
           var lastNode = t.expressionStatement(t.identifier(embeddedName));
           lastNode[_constants.SKIP] = true;
 
           // Transform the function
-          var evalProgram = t.program([t.functionDeclaration(t.identifier(embeddedName), [], t.blockStatement([t.variableDeclaration("var", [t.variableDeclarator(t.arrayPattern([t.identifier(thisName), t.identifier(rgfArrayName)]), t.thisExpression())]), t.functionDeclaration(t.identifier(replacementName), path.node.params, path.node.body), t.returnStatement(t.callExpression(t.memberExpression(t.identifier(replacementName), t.identifier("apply")), [t.identifier(thisName), t.identifier("arguments")]))])), lastNode]);
+          var evalProgram = t.program([t.functionDeclaration(t.identifier(embeddedName), [], t.blockStatement([t.variableDeclaration("var", [t.variableDeclarator(t.arrayPattern([t.identifier(rgfArrayName), t.identifier(argumentsName)]), t.identifier("arguments"))]), t.functionDeclaration(t.identifier(replacementName), path.node.params, path.node.body), t.returnStatement(t.callExpression(t.memberExpression(t.identifier(replacementName), t.identifier("apply")), [t.thisExpression(), t.identifier(argumentsName)]))])), lastNode]);
           var strictModeEnforcingBlock = path.find(function (p) {
             return (0, _astUtils.isStrictMode)(p);
           });
@@ -147,7 +164,8 @@ var _default = exports["default"] = function _default(_ref) {
           me.skip(path);
 
           // Update body to point to new function
-          path.get("body").replaceWith(t.blockStatement([t.returnStatement(t.callExpression(t.memberExpression(t.memberExpression(t.identifier(rgfArrayName), (0, _node.numericLiteral)(index), true), t.stringLiteral("apply"), true), [t.arrayExpression([t.thisExpression(), t.identifier(rgfArrayName)]), t.identifier("arguments")]))]));
+          path.get("body").replaceWith(t.blockStatement([t.returnStatement(t.callExpression(t.memberExpression(t.memberExpression(t.identifier(rgfArrayName), (0, _node.numericLiteral)(index), true), t.stringLiteral("apply"), true), [t.thisExpression(), t.arrayExpression([t.identifier(rgfArrayName), t.identifier("arguments")])]))]));
+          path.skip();
           me.setFunctionLength(path, originalLength);
           me.changeData.functions++;
         }