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

package/dist/transforms/shuffle.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
-var _probability = require("../probability");
 var _randomUtils = require("../utils/random-utils");
 var _template = _interopRequireDefault(require("../templates/template"));
 var _order = require("../order");
 var _staticUtils = require("../utils/static-utils");
 var _constants = require("../constants");
 var _node = require("../utils/node");
+var _astUtils = require("../utils/ast-utils");
 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; }
@@ -29,6 +29,7 @@ var _default = exports["default"] = function _default(_ref) {
       arrays: 0
     }
   });
+  var fnName = null;
   return {
     visitor: {
       ArrayExpression: {
@@ -40,23 +41,21 @@ var _default = exports["default"] = function _default(_ref) {
             return !(0, _staticUtils.isStaticValue)(element);
           });
           if (illegalElement) return;
-          if (!(0, _probability.computeProbabilityMap)(me.options.shuffle)) {
+          if (!me.computeProbabilityMap(me.options.shuffle)) {
             return;
           }
+
+          // Create un-shuffling function
+          if (!fnName) {
+            fnName = me.getPlaceholder() + "_shuffle";
+            (0, _astUtils.prependProgram)(path, new _template["default"]("\n          function ".concat(fnName, "(arr, shift) {\n            for (var i = 0; i < shift; i++) {\n              arr[\"push\"](arr[\"shift\"]());\n            }\n            return arr;\n          }\n          ")).addSymbols(_constants.PREDICTABLE).single());
+          }
           var shift = (0, _randomUtils.getRandomInteger)(1, Math.min(30, path.node.elements.length * 6));
           var shiftedElements = _toConsumableArray(path.node.elements);
           for (var i = 0; i < shift; i++) {
             shiftedElements.unshift(shiftedElements.pop());
           }
-          var block = path.find(function (p) {
-            return p.isBlock();
-          });
-          var functionExpression = new _template["default"]("\n          (function(arr) {\n            for (var i = 0; i < {shiftNode}; i++) {\n              arr.push(arr.shift());\n            }\n            return arr;\n          })\n          ").expression({
-            shiftNode: (0, _node.numericLiteral)(shift)
-          });
-          functionExpression[_constants.PREDICTABLE] = true;
-          var memberExpression = me.getControlObject(block).addProperty(functionExpression);
-          path.replaceWith(t.callExpression(memberExpression, [t.arrayExpression(shiftedElements)]));
+          path.replaceWith(t.callExpression(t.identifier(fnName), [t.arrayExpression(shiftedElements), (0, _node.numericLiteral)(shift)]));
           path.skip();
           me.changeData.arrays++;
         }

package/dist/transforms/string/stringCompression.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _order = require("../../order");
-var _probability = require("../../probability");
 var _astUtils = require("../../utils/ast-utils");
 var _node = require("../../utils/node");
 var _stringCompressionTemplate = require("../../templates/stringCompressionTemplate");
@@ -17,7 +16,7 @@ var _constants = require("../../constants");
 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 pako = require("pako");
+var LZString = require("lz-string");
 var _default = exports["default"] = function _default(_ref) {
   var Plugin = _ref.Plugin;
   var me = Plugin(_order.Order.StringCompression, {
@@ -25,6 +24,10 @@ var _default = exports["default"] = function _default(_ref) {
       strings: 0
     }
   });
+
+  // String Compression is only applied to the main obfuscator
+  // Any RGF functions will not have string compression due to the size of the decompression function
+
   var _stringDelimiter = "|";
   return {
     visitor: {
@@ -37,6 +40,8 @@ var _default = exports["default"] = function _default(_ref) {
           programPath.traverse({
             StringLiteral: {
               exit: function exit(path) {
+                // Don't change module imports
+                if ((0, _astUtils.isModuleImport)(path)) return;
                 var originalValue = path.node.value;
 
                 // Must be at least 3 characters long
@@ -47,7 +52,7 @@ var _default = exports["default"] = function _default(_ref) {
                 var index = stringMap.get(originalValue);
                 if (typeof index === "undefined") {
                   // Allow user option to skip compression for certain strings
-                  if (!(0, _probability.computeProbabilityMap)(me.options.stringCompression, originalValue)) {
+                  if (!me.computeProbabilityMap(me.options.stringCompression, originalValue)) {
                     return;
                   }
                   index = stringMap.size;
@@ -65,9 +70,8 @@ var _default = exports["default"] = function _default(_ref) {
           var stringPayload = Array.from(stringMap.keys()).join(_stringDelimiter);
 
           // Compress the string
-          var compressedBuffer = pako.deflate(stringPayload);
-          var compressedBase64 = Buffer.from(compressedBuffer).toString("base64");
-          var pakoName = me.obfuscator.getStringCompressionLibraryName();
+          var compressedString = LZString.compressToUTF16(stringPayload);
+          var stringCompressionLibraryName = me.obfuscator.getStringCompressionLibraryName();
           var insertStringCompressionLibrary = !me.obfuscator.parentObfuscator;
           (0, _astUtils.prependProgram)(programPath, _stringCompressionTemplate.StringCompressionTemplate.compile({
             stringFn: stringFn,
@@ -77,15 +81,15 @@ var _default = exports["default"] = function _default(_ref) {
               return t.stringLiteral(_stringDelimiter);
             },
             stringValue: function stringValue() {
-              return t.stringLiteral(compressedBase64);
+              return t.stringLiteral(compressedString);
             },
             GetGlobalTemplate: (0, _getGlobalTemplate.createGetGlobalTemplate)(me, programPath),
             getGlobalFnName: me.getPlaceholder(),
-            pakoName: pakoName
+            StringCompressionLibrary: stringCompressionLibraryName
           }));
           if (insertStringCompressionLibrary) {
-            // RGF function should also clone the entire decompression function
-            (0, _astUtils.prependProgram)(programPath, _obfuscator["default"].parseCode(_stringCompressionTemplate.PakoInflateMin.replace(/{pako}/g, pakoName)).program.body)[0].get("declarations")[0].get("id").node[_constants.NO_RENAME] = true;
+            // RGF functions should not clone the entire decompression function
+            (0, _astUtils.prependProgram)(programPath, _obfuscator["default"].parseCode(_stringCompressionTemplate.StringCompressionLibraryMinified.replace(/{StringCompressionLibrary}/g, stringCompressionLibraryName)).program.body)[0].get("declarations")[0].get("id").node[_constants.NO_RENAME] = true;
           }
         }
       }

package/dist/transforms/string/stringConcealing.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _template = _interopRequireDefault(require("../../templates/template"));
 var _order = require("../../order");
-var _probability = require("../../probability");
 var _assert = require("assert");
 var _bufferToStringTemplate = require("../../templates/bufferToStringTemplate");
 var _getGlobalTemplate = require("../../templates/getGlobalTemplate");
@@ -16,6 +15,7 @@ var _astUtils = require("../../utils/ast-utils");
 var _randomUtils = require("../../utils/random-utils");
 var _encoding = require("./encoding");
 var _node = require("../../utils/node");
+var _constants = require("../../constants");
 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,7 +30,8 @@ var _default = exports["default"] = function _default(_ref) {
   var Plugin = _ref.Plugin;
   var me = Plugin(_order.Order.StringConcealing, {
     changeData: {
-      strings: 0
+      strings: 0,
+      decryptionFunctions: 0
     }
   });
   var blocks = [];
@@ -72,6 +73,7 @@ var _default = exports["default"] = function _default(_ref) {
     if (typeof encoding.code === "string") {
       encoding.code = new _template["default"](encoding.code);
     }
+    me.changeData.decryptionFunctions++;
     encodingImplementations[encoding.identity] = encoding;
     return encoding;
   }
@@ -111,7 +113,7 @@ var _default = exports["default"] = function _default(_ref) {
                 }
 
                 // Check user setting
-                if (!(0, _probability.computeProbabilityMap)(me.options.stringConcealing, originalValue)) {
+                if (!me.computeProbabilityMap(me.options.stringConcealing, originalValue)) {
                   return;
                 }
                 var block = path.findParent(function (p) {
@@ -192,13 +194,13 @@ var _default = exports["default"] = function _default(_ref) {
             (0, _assert.ok)(encodingImplementation.code instanceof _template["default"]);
 
             // The decoder function
-            var decoder = encodingImplementation.code.compile({
+            var decoder = encodingImplementation.code.addSymbols(_constants.NO_REMOVE).compile({
               fnName: decodeFnName,
               __bufferToStringFunction__: bufferToStringName
             });
 
             // The main function to get the string value
-            var retrieveFunctionDeclaration = new _template["default"]("\n              function ".concat(fnName, "(index) {\n                return ").concat(decodeFnName, "(").concat(stringArrayName, "[index]);\n              }\n            ")).single();
+            var retrieveFunctionDeclaration = new _template["default"]("\n              function ".concat(fnName, "(index) {\n                return ").concat(decodeFnName, "(").concat(stringArrayName, "[index]);\n              }\n            ")).addSymbols(_constants.NO_REMOVE).single();
             (0, _astUtils.prepend)(block, [].concat(_toConsumableArray(decoder), [retrieveFunctionDeclaration]));
           }
         }

package/dist/transforms/string/stringEncoding.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _randomUtils = require("../../utils/random-utils");
-var _probability = require("../../probability");
 var _constants = require("../../constants");
+var _astUtils = require("../../utils/ast-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); }
 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 pad(x, len) {
@@ -52,10 +52,12 @@ var _default = exports["default"] = function _default(me) {
     visitor: {
       StringLiteral: {
         exit: function exit(path) {
+          // Ignore module imports
+          if ((0, _astUtils.isModuleImport)(path)) return;
           var value = path.node.value;
 
           // Allow percentages
-          if (!(0, _probability.computeProbabilityMap)(me.options.stringEncoding, value)) return;
+          if (!me.computeProbabilityMap(me.options.stringEncoding, value)) return;
           var type = (0, _randomUtils.choice)(["hexadecimal", "unicode"]);
           var escapedString = (type == "hexadecimal" ? toHexRepresentation : toUnicodeRepresentation)(value);
           var id = t.identifier("\"".concat(escapedString, "\""));

package/dist/transforms/string/stringSplitting.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _randomUtils = require("../../utils/random-utils");
-var _probability = require("../../probability");
 var _types = require("@babel/types");
 var _assert = require("assert");
 var _order = require("../../order");
@@ -28,6 +27,9 @@ var _default = exports["default"] = function _default(_ref) {
       StringLiteral: {
         exit: function exit(path) {
           var object = path.node;
+
+          // Don't change module imports
+          if ((0, _astUtils.isModuleImport)(path)) return;
           var size = Math.round(Math.max(6, object.value.length / (0, _randomUtils.getRandomInteger)(3, 8)));
           if (object.value.length <= size) {
             return;
@@ -36,7 +38,7 @@ var _default = exports["default"] = function _default(_ref) {
           if (!chunks || chunks.length <= 1) {
             return;
           }
-          if (!(0, _probability.computeProbabilityMap)(me.options.stringSplitting, object.value)) {
+          if (!me.computeProbabilityMap(me.options.stringSplitting, object.value)) {
             return;
           }
           var binExpr;

package/dist/transforms/variableMasking.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _template = _interopRequireDefault(require("../templates/template"));
-var _probability = require("../probability");
 var _order = require("../order");
 var _constants = require("../constants");
 var _astUtils = require("../utils/ast-utils");
@@ -58,7 +57,7 @@ var _default = exports["default"] = function _default(_ref) {
     // Do not apply to functions marked unsafe
     if (fnPath.node[_constants.UNSAFE]) return;
     var functionName = (0, _astUtils.getFunctionName)(fnPath);
-    if (!(0, _probability.computeProbabilityMap)(me.options.variableMasking, functionName)) {
+    if (!me.computeProbabilityMap(me.options.variableMasking, functionName)) {
       return;
     }
     var stackName = me.getPlaceholder() + "_varMask";
@@ -160,6 +159,8 @@ var _default = exports["default"] = function _default(_ref) {
     fnPath.traverse({
       Identifier: function Identifier(path) {
         if (!(0, _astUtils.isVariableIdentifier)(path)) return;
+        if (fnPath.get("id") === path) return; // Skip this function's name (Test #21)
+
         if (_constants.reservedIdentifiers.has(path.node.name)) return;
         if (me.options.globalVariables.has(path.node.name)) return;
         if (path.node.name === stackName) return;

package/dist/utils/NameGen.js

@@ -7,8 +7,9 @@ exports.NameGen = void 0;
 var _assert = require("assert");
 var _genUtils = require("./gen-utils");
 var _randomUtils = require("./random-utils");
-var _probability = require("../probability");
 var _constants = require("../constants");
+var _obfuscator = _interopRequireDefault(require("../obfuscator"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -48,7 +49,7 @@ var NameGen = exports.NameGen = /*#__PURE__*/function () {
         (0, _assert.ok)(typeof value === "string", "Custom identifier generator must return a string");
         return value;
       }
-      var mode = (0, _probability.computeProbabilityMap)(this.identifierGenerator);
+      var mode = _obfuscator["default"].prototype.computeProbabilityMap(this.identifierGenerator);
       var randomizedLength = (0, _randomUtils.getRandomInteger)(6, 8);
       switch (mode) {
         case "randomized":
@@ -72,6 +73,8 @@ var NameGen = exports.NameGen = /*#__PURE__*/function () {
           return "var_" + this.counter++;
         case "zeroWidth":
           return this.zeroWidthGenerator.generate();
+        case "chinese":
+          return (0, _randomUtils.getRandomChineseString)(randomizedLength);
         default:
           throw new Error("Invalid identifier generator mode: " + this.identifierGenerator);
       }

package/dist/utils/PredicateGen.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var t = _interopRequireWildcard(require("@babel/types"));
+var _astUtils = require("./ast-utils");
+var _NameGen = require("./NameGen");
+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 _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); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var PredicateGen = exports["default"] = /*#__PURE__*/function () {
+  function PredicateGen(plugin) {
+    _classCallCheck(this, PredicateGen);
+    _defineProperty(this, "dummyFunctionName", null);
+    _defineProperty(this, "programPath", null);
+    this.plugin = plugin;
+  }
+  return _createClass(PredicateGen, [{
+    key: "ensureCreated",
+    value: function ensureCreated() {
+      if (this.dummyFunctionName) return;
+      this.dummyFunctionName = this.plugin.getPlaceholder("dummyFunction");
+
+      // Insert dummy function
+      (0, _astUtils.prepend)(this.programPath, this.plugin.skip(t.functionDeclaration(t.identifier(this.dummyFunctionName), [], t.blockStatement([]))));
+    }
+  }, {
+    key: "generateTrueExpression",
+    value: function generateTrueExpression(path) {
+      return t.unaryExpression("!", this.generateFalseExpression(path));
+    }
+  }, {
+    key: "generateFalseExpression",
+    value: function generateFalseExpression(path) {
+      this.programPath = path.find(function (p) {
+        return p.isProgram();
+      });
+      this.ensureCreated();
+
+      // 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);
+      return this.plugin.skip(new _template["default"]("\"".concat(randomProperty, "\" in ").concat(this.dummyFunctionName)).expression());
+    }
+  }]);
+}();

package/dist/utils/ast-utils.js

@@ -303,16 +303,29 @@ function prepend(path) {
     // Preserve import declarations
     // Filter out import declarations
     var _body = listParent.get("body");
-    var lastImportIndex = _body.findIndex(function (path) {
-      return !path.isImportDeclaration();
-    });
-    if (lastImportIndex === 0 || lastImportIndex === -1) {
-      // No non-import declarations, so we can safely unshift everything
+    var afterImport = 0;
+    var _iterator4 = _createForOfIteratorHelper(_body),
+      _step4;
+    try {
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        var stmt = _step4.value;
+        if (!stmt.isImportDeclaration()) {
+          break;
+        }
+        afterImport++;
+      }
+    } catch (err) {
+      _iterator4.e(err);
+    } finally {
+      _iterator4.f();
+    }
+    if (afterImport === 0) {
+      // No import declarations, so we can safely unshift everything
       return registerPaths(listParent.unshiftContainer("body", nodes));
-    } else {
-      // Insert the nodes after the last import declaration
-      return registerPaths(_body[lastImportIndex - 1].insertAfter(nodes));
     }
+
+    // Insert the nodes after the last import declaration
+    return registerPaths(_body[afterImport - 1].insertAfter(nodes));
   }
   if (listParent.isFunction()) {
     var body = listParent.get("body");
@@ -326,7 +339,8 @@ function prepend(path) {
   }
   if (listParent.isBlock()) {
     return registerPaths(listParent.unshiftContainer("body", nodes));
-  } else if (listParent.isSwitchCase()) {
+  }
+  if (listParent.isSwitchCase()) {
     return registerPaths(listParent.unshiftContainer("consequent", nodes));
   }
   (0, _assert.ok)(false);
@@ -336,6 +350,7 @@ function prependProgram(path) {
     return p.isProgram();
   });
   (0, _assert.ok)(program);
+  (0, _assert.ok)(program.isProgram());
   for (var _len3 = arguments.length, nodes = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
     nodes[_key3 - 1] = arguments[_key3];
   }

package/dist/utils/random-utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.chance = chance;
 exports.choice = choice;
 exports.getRandom = getRandom;
+exports.getRandomChineseString = getRandomChineseString;
 exports.getRandomHexString = getRandomHexString;
 exports.getRandomInteger = getRandomInteger;
 exports.getRandomString = getRandomString;
@@ -60,6 +61,15 @@ function getRandomHexString(length) {
   }).join("").toUpperCase();
 }
 
+/**
+ * @see https://github.com/MichaelXF/js-confuser/issues/150#issuecomment-2466159582
+ */
+function getRandomChineseString(length) {
+  var characters = [];
+  for (var i = 0; i < length; i++) characters.push(String.fromCharCode(Math.floor(Math.random() * (0x9fff - 0x4e00)) + 0x4e00));
+  return characters.join("");
+}
+
 /**
  * Returns a random string.
  */

package/dist/validateOptions.js

@@ -102,7 +102,7 @@ function applyDefaultsToOptions(options) {
     options.globalVariables = new Set([]);
     if (options.target == "browser") {
       // browser
-      ["window", "document", "postMessage", "alert", "confirm", "location", "btoa", "atob", "unescape", "encodeURIComponent"].forEach(function (x) {
+      ["window", "document", "postMessage", "alert", "confirm", "location"].forEach(function (x) {
         return options.globalVariables.add(x);
       });
     } else {
@@ -111,7 +111,7 @@ function applyDefaultsToOptions(options) {
         return options.globalVariables.add(x);
       });
     }
-    ["globalThis", "console", "parseInt", "parseFloat", "Math", "JSON", "RegExp", "Promise", "String", "Boolean", "Function", "Object", "Array", "Proxy", "Error", "TypeError", "ReferenceError", "RangeError", "EvalError", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "setImmediate", "clearImmediate", "queueMicrotask", "isNaN", "isFinite", "Set", "Map", "WeakSet", "WeakMap", "Symbol", "TextDecoder", "TextEncoder", "Uint8Array", "Uint16Array", "Uint32Array", "ArrayBuffer"].forEach(function (x) {
+    ["globalThis", "console", "parseInt", "parseFloat", "Math", "JSON", "RegExp", "Promise", "String", "Boolean", "Function", "Object", "Array", "Proxy", "Error", "TypeError", "ReferenceError", "RangeError", "EvalError", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "setImmediate", "clearImmediate", "queueMicrotask", "isNaN", "isFinite", "Set", "Map", "WeakSet", "WeakMap", "Symbol", "TextDecoder", "TextEncoder", "Uint8Array", "Uint16Array", "Uint32Array", "Int8Array", "Int16Array", "Int32Array", "ArrayBuffer", "btoa", "atob", "unescape", "encodeURIComponent"].forEach(function (x) {
       return options.globalVariables.add(x);
     });
   }

package/index.d.ts

@@ -1,3 +1,17 @@
-import JsConfuser from "./src";
+// Export all the types from the index file
+export * from "./src/index";
+export { default } from "./src/index";
 
-export default JsConfuser;
+// Export useful types
+export type {
+  ObfuscateOptions,
+  ProbabilityMap,
+  CustomLock,
+  CustomStringEncoding,
+} from "./src/options";
+export type {
+  ObfuscationResult,
+  ProfileData,
+  ProfilerCallback,
+  ProfilerLog,
+} from "./src/obfuscationResult";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-confuser",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "description": "JavaScript Obfuscation Tool.",
   "main": "dist/index.js",
   "types": "index.d.ts",
@@ -26,7 +26,7 @@
     "@babel/parser": "^7.25.6",
     "@babel/traverse": "^7.25.6",
     "@babel/types": "^7.25.6",
-    "pako": "^2.1.0"
+    "lz-string": "^1.5.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.8",

package/src/constants.ts

@@ -1,5 +1,3 @@
-import ControlObject from "./utils/ControlObject";
-
 export const predictableFunctionTag = "__JS_PREDICT__";
 
 /**
@@ -31,8 +29,6 @@ export const SKIP = Symbol("skip");
  */
 export const FN_LENGTH = Symbol("fnLength");
 
-export const CONTROL_OBJECTS = Symbol("controlObjects");
-
 export const NO_RENAME = Symbol("noRename");
 
 /**
@@ -58,6 +54,11 @@ export const MULTI_TRANSFORM = Symbol("multiTransform");
  */
 export const WITH_STATEMENT = Symbol("withStatement");
 
+/**
+ * Tells minify to not remove the node.
+ */
+export const NO_REMOVE = Symbol("noRemove");
+
 /**
  * Symbols describe precomputed semantics of a node, allowing the obfuscator to make the best choices for the node.
  */
@@ -66,12 +67,12 @@ export interface NodeSymbol {
   [PREDICTABLE]?: boolean;
   [SKIP]?: boolean | number;
   [FN_LENGTH]?: number;
-  [CONTROL_OBJECTS]?: ControlObject[];
   [NO_RENAME]?: string | number;
 
   [GEN_NODE]?: boolean;
   [MULTI_TRANSFORM]?: boolean;
   [WITH_STATEMENT]?: boolean;
+  [NO_REMOVE]?: boolean;
 }
 
 /**
@@ -94,6 +95,15 @@ export const reservedIdentifiers = new Set([
   "arguments",
 ]);
 
+/**
+ * Reserved Node.JS module identifiers.
+ */
+export const reservedNodeModuleIdentifiers = new Set([
+  "module",
+  "exports",
+  "require",
+]);
+
 export const reservedObjectPrototype = new Set([
   "toString",
   "valueOf",

package/src/index.ts

@@ -32,10 +32,16 @@ export async function obfuscateWithProfiler(
   sourceCode: string,
   options: ObfuscateOptions,
   profiler: {
-    callback: ProfilerCallback;
-    performance: { now(): number };
-  }
+    callback?: ProfilerCallback;
+    performance?: { now(): number };
+  } = {}
 ): Promise<ObfuscationResult & { profileData: ProfileData }> {
+  if (!profiler.performance) {
+    profiler.performance = {
+      now: () => Date.now(),
+    };
+  }
+
   const startTime = performance.now();
 
   const obfuscator = new Obfuscator(options);
@@ -54,12 +60,14 @@ export async function obfuscateWithProfiler(
   ast = obfuscator.obfuscateAST(ast, {
     profiler: (log: ProfilerLog) => {
       var nowTime = performance.now();
-      transformMap[log.currentTransform] = {
+      let entry = {
         transformTime: nowTime - currentTransformTime,
         changeData: {},
       };
+
+      transformMap[log.currentTransform] = entry;
       currentTransformTime = nowTime;
-      profiler.callback(log);
+      profiler.callback?.(log, entry, ast);
     },
   });
 
@@ -96,8 +104,10 @@ const JsConfuser = {
   obfuscate,
   obfuscateAST,
   obfuscateWithProfiler,
+  Obfuscator,
   presets,
   Template,
 };
 
 export default JsConfuser;
+export { Obfuscator, presets, Template };

package/src/obfuscationResult.ts

@@ -1,4 +1,5 @@
 import { PluginInstance } from "./transforms/plugin";
+import { File } from "@babel/types";
 
 /**
  * Obfuscation result object.
@@ -23,6 +24,7 @@ export interface ProfileData {
     [transformName: string]: {
       transformTime: number;
       changeData: PluginInstance["changeData"];
+      fileSize?: string;
     };
   };
 }
@@ -30,7 +32,11 @@ export interface ProfileData {
 /**
  * A callback function that is called when a transform is applied.
  */
-export type ProfilerCallback = (log: ProfilerLog) => void;
+export type ProfilerCallback = (
+  log: ProfilerLog,
+  transformEntry?: object,
+  ast?: File
+) => void;
 
 /**
  * The current progress of the obfuscation process.