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

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 }; }
@@ -26,6 +25,7 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var _default = exports["default"] = function _default(_ref) {
+  var _me$options$lock$defa;
   var Plugin = _ref.Plugin;
   var me = Plugin(_order.Order.Lock, {
     changeData: {
@@ -33,12 +33,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
@@ -71,7 +79,7 @@ var _default = exports["default"] = function _default(_ref) {
   }
   if (me.options.lock.selfDefending) {
     me.options.lock.customLocks.push({
-      code: "\n      (\n        function(){\n          // Breaks any code formatter\n          var namedFunction = function(){\n            const test = function(){\n              const regExp=new RegExp('\\n');\n              return regExp['test'](namedFunction)\n            };\n\n            if(test()) {\n              {countermeasures}\n            }\n          }\n\n          return namedFunction();\n        }\n    )();\n      ",
+      code: "\n      (\n        function(){\n          // Breaks any code formatter\n          var namedFunction = function(){\n            const test = function(){\n              const regExp=new RegExp('\\n');\n              return regExp['test'](namedFunction)\n            };\n\n            if(test()) {\n              {countermeasures}\n            }\n          }\n\n          // Prepack Breaker\n          if(Math.random() > 1) {\n            while(true) {\n            console.log(\"Prepack Breaker\");\n            }\n          }\n\n          return namedFunction();\n        }\n    )();\n      ",
       percentagePerBlock: 0.5
     });
   }
@@ -98,13 +106,12 @@ var _default = exports["default"] = function _default(_ref) {
     return new _template["default"]("while(true){}").compile();
   };
   me.globalState.lock.createCountermeasuresCode = createCountermeasuresCode;
+  var defaultMaxCount = (_me$options$lock$defa = me.options.lock.defaultMaxCount) !== null && _me$options$lock$defa !== void 0 ? _me$options$lock$defa : 25;
   function applyLockToBlock(path, customLock) {
-    var times = timesMap.get(customLock);
-    if (typeof times === "undefined") {
-      times = 0;
-    }
-    var maxCount = customLock.maxCount || 100; // 100 is default max count
-    var minCount = customLock.minCount || 1; // 1 is default min count
+    var _customLock$maxCount, _customLock$minCount;
+    var times = timesMap.get(customLock) || 0;
+    var maxCount = (_customLock$maxCount = customLock.maxCount) !== null && _customLock$maxCount !== void 0 ? _customLock$maxCount : defaultMaxCount; // 25 is default max count
+    var minCount = (_customLock$minCount = customLock.minCount) !== null && _customLock$minCount !== void 0 ? _customLock$minCount : 1; // 1 is default min count
 
     if (maxCount >= 0 && times > maxCount) {
       // Limit creation, allowing -1 to disable the limit entirely
@@ -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

@@ -25,6 +25,33 @@ identifierMap.set("undefined", function () {
 identifierMap.set("Infinity", function () {
   return t.binaryExpression("/", t.numericLiteral(1), t.numericLiteral(0));
 });
+function trySimpleDestructuring(id, init) {
+  // Simple array/object destructuring
+  if (id.isArrayPattern() && init.isArrayExpression()) {
+    var elements = id.get("elements");
+    var initElements = init.get("elements");
+    if (elements.length === 1 && initElements.length === 1) {
+      id.replaceWith(elements[0]);
+      init.replaceWith(initElements[0]);
+    }
+  }
+  if (id.isObjectPattern() && init.isObjectExpression()) {
+    var properties = id.get("properties");
+    var initProperties = init.get("properties");
+    if (properties.length === 1 && initProperties.length === 1) {
+      var firstProperty = properties[0];
+      var firstInitProperty = initProperties[0];
+      if (firstProperty.isObjectProperty() && firstInitProperty.isObjectProperty()) {
+        var firstKey = firstProperty.get("key");
+        var firstInitKey = firstInitProperty.get("key");
+        if (firstKey.isIdentifier() && firstInitKey.isIdentifier() && firstKey.node.name === firstInitKey.node.name) {
+          id.replaceWith(firstProperty.node.value);
+          init.replaceWith(firstInitProperty.node.value);
+        }
+      }
+    }
+  }
+}
 
 /**
  * Minify removes unnecessary code and shortens the length for file size.
@@ -125,6 +152,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 +241,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();
@@ -222,32 +259,7 @@ var _default = exports["default"] = function _default(_ref) {
           }
           var id = path.get("id");
           var init = path.get("init");
-
-          // Simple array/object destructuring
-          if (id.isArrayPattern() && init.isArrayExpression()) {
-            var elements = id.get("elements");
-            var initElements = init.get("elements");
-            if (elements.length === 1 && initElements.length === 1) {
-              id.replaceWith(elements[0]);
-              init.replaceWith(initElements[0]);
-            }
-          }
-          if (id.isObjectPattern() && init.isObjectExpression()) {
-            var properties = id.get("properties");
-            var initProperties = init.get("properties");
-            if (properties.length === 1 && initProperties.length === 1) {
-              var firstProperty = properties[0];
-              var firstInitProperty = initProperties[0];
-              if (firstProperty.isObjectProperty() && firstInitProperty.isObjectProperty()) {
-                var firstKey = firstProperty.get("key");
-                var firstInitKey = firstInitProperty.get("key");
-                if (firstKey.isIdentifier() && firstInitKey.isIdentifier() && firstKey.node.name === firstInitKey.node.name) {
-                  id.replaceWith(firstProperty.node.value);
-                  init.replaceWith(firstInitProperty.node.value);
-                }
-              }
-            }
-          }
+          trySimpleDestructuring(id, init);
 
           // Remove unused variables
           // Can only remove if it's pure
@@ -255,6 +267,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()) {
@@ -266,6 +281,28 @@ var _default = exports["default"] = function _default(_ref) {
           }
         }
       },
+      // Simple destructuring
+      // Simple arithmetic operations
+      AssignmentExpression: {
+        exit: function exit(path) {
+          if (path.node.operator === "=") {
+            trySimpleDestructuring(path.get("left"), path.get("right"));
+          }
+          if (path.node.operator === "+=") {
+            var left = path.get("left");
+            var right = path.get("right");
+
+            // a += 1 -> a++
+            if (right.isNumericLiteral({
+              value: 1
+            })) {
+              if (left.isIdentifier() || left.isMemberExpression()) {
+                path.replaceWith(t.updateExpression("++", left.node));
+              }
+            }
+          }
+        }
+      },
       // return undefined->return
       ReturnStatement: {
         exit: function exit(path) {

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,10 +30,10 @@ 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);
+    return (0, _randomUtils.chance)(500 - transformCount - depth * 100);
   }
   function wrapWithPredicate(path) {
     var newExpression = t.logicalExpression("&&", createTruePredicate(path), path.node);

package/dist/transforms/pack.js

@@ -27,16 +27,32 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function pack(_ref) {
+  var _me$obfuscator$parent;
   var Plugin = _ref.Plugin;
   var me = Plugin(_order.Order.Pack, {
     changeData: {
       globals: 0
     }
   });
-  var _objectName = me.obfuscator.nameGen.generate();
-  var mappings = new Map();
-  var setterPropsNeeded = new Set();
-  var typeofMappings = new Map();
+
+  // RGF functions will re-use parent Pack Interface
+  var packInterface = (_me$obfuscator$parent = me.obfuscator.parentObfuscator) === null || _me$obfuscator$parent === void 0 ? void 0 : _me$obfuscator$parent.packInterface;
+
+  // Create new Pack Interface (root)
+  if (!packInterface) {
+    packInterface = {
+      objectName: me.obfuscator.nameGen.generate(),
+      mappings: new Map(),
+      setterPropsNeeded: new Set(),
+      typeofMappings: new Map()
+    };
+    me.obfuscator.packInterface = packInterface;
+  }
+  var _packInterface = packInterface,
+    _objectName = _packInterface.objectName,
+    mappings = _packInterface.mappings,
+    setterPropsNeeded = _packInterface.setterPropsNeeded,
+    typeofMappings = _packInterface.typeofMappings;
   var prependNodes = [];
   return {
     // Transform identifiers, preserve import statements
@@ -59,9 +75,18 @@ function pack(_ref) {
           if (path.node[_constants.WITH_STATEMENT]) return;
           var identifierName = path.node.name;
           if (_constants.reservedIdentifiers.has(identifierName)) return;
-          if (me.obfuscator.options.globalVariables.has(identifierName)) return;
+          if (me.options.target === "node" && _constants.reservedNodeModuleIdentifiers.has(identifierName)) {
+            // Allow module.exports and require
+          } else {
+            if (me.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"
           })) {
@@ -91,6 +116,8 @@ function pack(_ref) {
     // Final AST handler
     // Very last step in the obfuscation process
     finalASTHandler: function finalASTHandler(ast) {
+      if (me.obfuscator.parentObfuscator) return ast; // Only for root obfuscator
+
       // Create object expression
       // Very similar to flatten, maybe refactor to use the same code
       var objectProperties = [];

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/preparation.js

@@ -11,6 +11,8 @@ var _constants = require("../constants");
 var _assert = require("assert");
 var _astUtils = require("../utils/ast-utils");
 var _functionUtils = require("../utils/function-utils");
+var _template = _interopRequireDefault(require("../templates/template"));
+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 _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; } } }; }
@@ -49,6 +51,29 @@ var _default = exports["default"] = function _default(_ref) {
           markFunctionUnsafe(path);
         }
       },
+      // @js-confuser-var "myVar" -> __JS_CONFUSER_VAR__(myVar)
+      StringLiteral: {
+        exit: function exit(path) {
+          var _path$node$leadingCom;
+          // Check for @js-confuser-var comment
+          if ((_path$node$leadingCom = path.node.leadingComments) !== null && _path$node$leadingCom !== void 0 && _path$node$leadingCom.find(function (comment) {
+            return comment.value.includes("@js-confuser-var");
+          })) {
+            var identifierName = path.node.value;
+            (0, _assert.ok)(t.isValidIdentifier(identifierName), "Invalid identifier name: " + identifierName);
+
+            // Create a new __JS_CONFUSER_VAR__ call with the identifier
+            var newExpression = new _template["default"]("__JS_CONFUSER_VAR__({identifier})").expression({
+              identifier: t.identifier(identifierName)
+            });
+            path.replaceWith(newExpression);
+
+            // Remove comment and skip further processing
+            path.node.leadingComments = [];
+            path.skip();
+          }
+        }
+      },
       // `Hello ${username}` -> "Hello " + username
       TemplateLiteral: {
         exit: function exit(path) {
@@ -256,42 +281,6 @@ var _default = exports["default"] = function _default(_ref) {
             path.node.body = t.blockStatement([path.node.body]);
           }
         }
-      },
-      // function a(param = ()=>b)
-      // _getB = ()=> ()=>b
-      // function a(param = _getB())
-      // Basically Babel scope.rename misses this edge case, so we need to manually handle it
-      // Here were essentially making the variables easier to understand
-      Function: {
-        exit: function exit(path) {
-          var _iterator3 = _createForOfIteratorHelper(path.get("params")),
-            _step3;
-          try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var param = _step3.value;
-              param.traverse({
-                "FunctionExpression|ArrowFunctionExpression": function FunctionExpressionArrowFunctionExpression(_innerPath) {
-                  var innerPath = _innerPath;
-                  var child = innerPath.find(function (path) {
-                    var _path$parentPath;
-                    return (_path$parentPath = path.parentPath) === null || _path$parentPath === void 0 ? void 0 : _path$parentPath.isAssignmentPattern();
-                  });
-                  if (!child) return;
-                  if (t.isAssignmentPattern(child.parent) && child.parent.right === child.node) {
-                    var creatorName = me.getPlaceholder();
-                    var insertPath = path.insertBefore(t.variableDeclaration("const", [t.variableDeclarator(t.identifier(creatorName), t.arrowFunctionExpression([], innerPath.node, false))]))[0];
-                    path.scope.parent.registerDeclaration(insertPath);
-                    innerPath.replaceWith(t.callExpression(t.identifier(creatorName), []));
-                  }
-                }
-              });
-            }
-          } catch (err) {
-            _iterator3.e(err);
-          } finally {
-            _iterator3.f();
-          }
-        }
       }
     }
   };

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);
           });
@@ -125,12 +142,14 @@ var _default = exports["default"] = function _default(_ref) {
           }).map(function (plugin) {
             return plugin.pluginInstance.order;
           }));
-          newObfuscator.plugins = newObfuscator.plugins.filter(function (plugin) {
-            return plugin.pluginInstance.order == _order.Order.Preparation || !hasRan.has(plugin.pluginInstance.order);
-          });
-          newObfuscator.obfuscateAST(evalFile, {
-            disablePack: true
+
+          // Global Concealing will likely cause issues when Pack is also enabled
+          var disallowedTransforms = new Set([_order.Order.GlobalConcealing]);
+          newObfuscator.plugins = newObfuscator.plugins.filter(function (_ref2) {
+            var pluginInstance = _ref2.pluginInstance;
+            return (pluginInstance.order == _order.Order.Preparation || !hasRan.has(pluginInstance.order)) && !disallowedTransforms.has(pluginInstance.order);
           });
+          newObfuscator.obfuscateAST(evalFile);
           var generated = _obfuscator["default"].generateCode(evalFile);
           var functionExpression = t.callExpression(t.identifier(rgfEvalName), [t.stringLiteral(generated)]);
           var index = rgfArrayExpression.elements.length;
@@ -147,7 +166,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++;
         }