js-confuser 2.1.0 → 2.1.1

package/dist/transforms/dispatcher.js

@@ -304,6 +304,9 @@ var _default = exports["default"] = function _default(_ref) {
               newBody.unshift(t.expressionStatement(t.stringLiteral("Dispatcher: ".concat(name, " -> ").concat(newName))));
             }
             var functionExpression = t.functionExpression(null, [], t.blockStatement(newBody));
+
+            // Carry over original source loc info
+            t.inherits(functionExpression, originalFn);
             var _iterator5 = _createForOfIteratorHelper(Object.getOwnPropertySymbols(originalFn)),
               _step5;
             try {

package/dist/transforms/flatten.js

@@ -142,6 +142,12 @@ var _default = exports["default"] = function _default(_ref) {
         if (!setterPropsNeeded.has(identifierName)) {
           // Only provide 'set' method if the variable is modified
           var isModification = (0, _astUtils.isModifiedIdentifier)(identifierPath);
+
+          // Important: Do not generate setters for "const" bindings
+          var binding = identifierPath.scope.getBinding(identifierName);
+          if ((binding === null || binding === void 0 ? void 0 : binding.kind) === "const") {
+            isModification = false; // Prevent 'setter' as while not a syntax error, causes problems for build tools
+          }
           if (isModification) {
             setterPropsNeeded.add(identifierName);
           }
@@ -214,14 +220,19 @@ var _default = exports["default"] = function _default(_ref) {
     } finally {
       _iterator3.f();
     }
-    var flattenedFunctionDeclaration = t.functionDeclaration(t.identifier(newFnName), [t.arrayPattern(_toConsumableArray(fnPath.node.params)), t.identifier(flatObjectName)], t.blockStatement(_toConsumableArray(fnPath.node.body.body).concat()), false, fnPath.node.async);
+    var flattenedFunctionDeclaration = t.functionDeclaration(t.identifier(newFnName), [t.identifier(flatObjectName), t.arrayPattern(_toConsumableArray(fnPath.node.params))], t.blockStatement(_toConsumableArray(fnPath.node.body.body).concat()), false, fnPath.node.async);
+
+    // Carry over original source loc info
+    t.inherits(flattenedFunctionDeclaration, fnPath.node);
 
     // Create the flat object variable declaration
     var flatObjectDeclaration = t.variableDeclaration("var", [t.variableDeclarator(t.identifier(flatObjectName), t.objectExpression(flatObjectProperties))]);
     var argName = me.getPlaceholder() + "_args";
 
     // Replace original function body with a call to the flattened function
-    fnPath.node.body = t.blockStatement([flatObjectDeclaration, t.returnStatement(t.callExpression(t.identifier(newFnName), [t.identifier(argName), t.identifier(flatObjectName)]))]);
+    fnPath.node.body = t.blockStatement([flatObjectDeclaration, t.returnStatement(t.callExpression(t.identifier(newFnName), [t.identifier(flatObjectName),
+    // Default params require flat object first
+    t.identifier(argName)]))]);
     var originalLength = (0, _functionUtils.computeFunctionLength)(fnPath);
     fnPath.node.params = [t.restElement(t.identifier(argName))];
 

package/dist/transforms/identifier/renameVariables.js

@@ -248,7 +248,6 @@ var _default = exports["default"] = function _default(_ref) {
           // 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) {

package/dist/transforms/lock/integrity.js

@@ -57,7 +57,8 @@ var _default = exports["default"] = function _default(_ref) {
 
           // Function is redefined, do not apply integrity
           if (!binding || binding.constantViolations.length > 0) return;
-          var code = me.obfuscator.generateCode(newFunctionDeclaration);
+          var _me$obfuscator$genera = me.obfuscator.generateCode(newFunctionDeclaration),
+            code = _me$obfuscator$genera.code;
           var codeTrimmed = code.replace(me.globalState.lock.integrity.sensitivityRegex, "");
           var seed = (0, _randomUtils.getRandomInteger)(0, 10000000);
           var hashCode = (0, _integrityTemplate.HashFunction)(codeTrimmed, seed);

package/dist/transforms/pack.js

@@ -171,9 +171,10 @@ function pack(_ref) {
       if (lastStatement && t.isExpressionStatement(lastStatement)) {
         Object.assign(lastStatement, t.returnStatement(lastStatement.expression));
       }
-      var _outputCode = _obfuscator["default"].generateCode(ast, _objectSpread(_objectSpread({}, me.obfuscator.options), {}, {
-        compact: true
-      }));
+      var _Obfuscator$generateC = _obfuscator["default"].generateCode(ast, _objectSpread(_objectSpread({}, me.obfuscator.options), {}, {
+          compact: true
+        })),
+        _outputCode = _Obfuscator$generateC.code;
       var newAST = new _template["default"]("\n    {prependNodes}\n    Function({objectName}, {outputCode})({objectExpression});\n  ").file({
         objectName: function objectName() {
           return t.stringLiteral(_objectName);

package/dist/transforms/preparation.js

@@ -47,7 +47,16 @@ var _default = exports["default"] = function _default(_ref) {
     visitor: {
       "ThisExpression|Super": {
         exit: function exit(path) {
-          markFunctionUnsafe(path);
+          var _fnPath;
+          var fnPath = path.find(function (p) {
+            return p.isFunction();
+          });
+          if ((_fnPath = fnPath) !== null && _fnPath !== void 0 && _fnPath.isArrowFunctionExpression()) fnPath = path.find(function (p) {
+            return p.isFunction() && !p.isArrowFunctionExpression();
+          });
+          if (fnPath) {
+            fnPath.node[_constants.UNSAFE] = true;
+          }
         }
       },
       // @js-confuser-var "myVar" -> __JS_CONFUSER_VAR__(myVar)

package/dist/transforms/rgf.js

@@ -149,7 +149,8 @@ var _default = exports["default"] = function _default(_ref) {
             return (pluginInstance.order == _order.Order.Preparation || !hasRan.has(pluginInstance.order)) && !disallowedTransforms.has(pluginInstance.order);
           });
           newObfuscator.obfuscateAST(evalFile);
-          var generated = _obfuscator["default"].generateCode(evalFile);
+          var _Obfuscator$generateC = _obfuscator["default"].generateCode(evalFile),
+            generated = _Obfuscator$generateC.code;
           var functionExpression = t.callExpression(t.identifier(rgfEvalName), [t.stringLiteral(generated)]);
           var index = rgfArrayExpression.elements.length;
           rgfArrayExpression.elements.push(functionExpression);

package/dist/transforms/string/encoding.js

@@ -10,12 +10,7 @@ var _randomUtils = require("../../utils/random-utils");
 var t = _interopRequireWildcard(require("@babel/types"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-var hasAllEncodings = false;
 function createDefaultStringEncoding(encodingImplementations) {
-  if (hasAllEncodings) {
-    return null;
-  }
-
   // Create base91 encoding
   var strTable = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$%&()*+,./:;<=>?@[]^_`{|}~"';
 
@@ -25,7 +20,6 @@ function createDefaultStringEncoding(encodingImplementations) {
 
   // Check if the encoding already exists
   if (typeof encodingImplementations[identity] !== "undefined") {
-    hasAllEncodings = true;
     return null;
   }
   var encodingImplementation = {

package/dist/transforms/string/stringConcealing.js

@@ -36,7 +36,6 @@ var _default = exports["default"] = function _default(_ref) {
   var blocks = [];
   var stringMap = new Map();
   var stringArrayName = me.getPlaceholder() + "_array";
-  var stringArrayCacheName = me.getPlaceholder() + "_cache";
   var encodingImplementations = Object.create(null);
   var availableStringEncodings = me.options.customStringEncodings;
 
@@ -185,11 +184,6 @@ var _default = exports["default"] = function _default(_ref) {
           (0, _astUtils.prependProgram)(programPath, t.variableDeclaration("var", [t.variableDeclarator(t.identifier(stringArrayName), t.arrayExpression(Array.from(stringMap.keys()).map(function (x) {
             return t.stringLiteral(x);
           })))]));
-
-          // Create the string cache
-          (0, _astUtils.prependProgram)(programPath, new _template["default"]("\n            var {stringArrayCacheName} = {};\n            ").single({
-            stringArrayCacheName: stringArrayCacheName
-          }));
           for (var _i = 0, _blocks = blocks; _i < _blocks.length; _i++) {
             var block = _blocks[_i];
             var _ref2 = block.node[STRING_CONCEALING],
@@ -205,7 +199,7 @@ var _default = exports["default"] = function _default(_ref) {
             });
 
             // The main function to get the string value
-            var retrieveFunctionDeclaration = new _template["default"]("\n              function ".concat(fnName, "(index) {\n                if (typeof ").concat(stringArrayCacheName, "[index] === 'undefined') {\n                  return ").concat(stringArrayCacheName, "[index] = ").concat(decodeFnName, "(").concat(stringArrayName, "[index]);\n                }\n                return ").concat(stringArrayCacheName, "[index];\n              }\n            ")).addSymbols(_constants.NO_REMOVE).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/utils/ast-utils.js

@@ -482,9 +482,11 @@ function isModifiedIdentifier(identifierPath) {
   if (identifierPath.parentPath.isUpdateExpression()) {
     isModification = true;
   }
+
+  // Important: Member expressions (object.identifier = true) are NOT considered modified. Here, "identifier" is not a variable here.
   if (identifierPath.find(function (p) {
     var _p$parentPath4;
-    return p.key === "left" && ((_p$parentPath4 = p.parentPath) === null || _p$parentPath4 === void 0 ? void 0 : _p$parentPath4.isAssignmentExpression());
+    return p.key === "left" && ((_p$parentPath4 = p.parentPath) === null || _p$parentPath4 === void 0 ? void 0 : _p$parentPath4.isAssignmentExpression()) && !p.isMemberExpression();
   })) {
     isModification = true;
   }

package/dist/utils/random-utils.js

@@ -42,9 +42,16 @@ function chance(percentChance) {
  * @param array
  */
 function shuffle(array) {
-  array.sort(function () {
-    return Math.random() - 0.5;
-  });
+  // Fisher-Yates shuffle
+  var currentIndex = array.length,
+    randomIndex;
+  while (currentIndex !== 0) {
+    randomIndex = Math.floor(Math.random() * currentIndex);
+    currentIndex--;
+    var _ref = [array[randomIndex], array[currentIndex]];
+    array[currentIndex] = _ref[0];
+    array[randomIndex] = _ref[1];
+  }
   return array;
 }
 

package/dist/validateOptions.js

@@ -9,7 +9,7 @@ var _assert = require("assert");
 var _presets = _interopRequireDefault(require("./presets"));
 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); }
-var validProperties = new Set(["preset", "target", "compact", "hexadecimalNumbers", "minify", "renameVariables", "renameGlobals", "renameLabels", "identifierGenerator", "controlFlowFlattening", "globalConcealing", "stringCompression", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "shuffle", "variableMasking", "verbose", "globalVariables", "debugComments", "preserveFunctionLength", "astScrambler", "customStringEncodings", "functionOutlining", "pack"]);
+var validProperties = new Set(["preset", "target", "compact", "hexadecimalNumbers", "minify", "renameVariables", "renameGlobals", "renameLabels", "identifierGenerator", "controlFlowFlattening", "globalConcealing", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "variableMasking", "verbose", "globalVariables", "debugComments", "preserveFunctionLength", "astScrambler", "customStringEncodings", "pack", "sourceMap", "sourceFileName"]);
 var validLockProperties = new Set(["selfDefending", "antiDebug", "tamperProtection", "startDate", "endDate", "domainLock", "integrity", "countermeasures", "customLocks"]);
 function validateOptions(options) {
   if (!options || Object.keys(options).length <= 1) {

package/package.json

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