js-confuser 1.5.8 → 1.5.9

package/CHANGELOG.md

@@ -1,3 +1,40 @@
+# `1.5.9`
+Big update
+
+This updates comes with many bug fixes:
+
+- Fixed [#72](https://github.com/MichaelXF/js-confuser/issues/72)
+- - ES5 to handle Class Fields
+
+Note: The `ES5` option is not meant to replace Babel. It is only intended to undo ES6 features the obfuscator may have added to your code.
+
+- Fixed [#74](https://github.com/MichaelXF/js-confuser/issues/74)
+- - Anti Tooling to not break Symbols
+
+- Fixed [#75](https://github.com/MichaelXF/js-confuser/issues/75)
+- - Minify to properly handle Object constructors
+
+- Fixed [#76](https://github.com/MichaelXF/js-confuser/issues/76)
+- - Minify to not cause syntax errors when objects used `^`, `` ` ``, `[`, `]` as property keys
+
+- Fixed [#77](https://github.com/MichaelXF/js-confuser/issues/77)
+- - Dispatcher to not break code that uses generic names like `toString` and `hasOwnProperty`
+
+- Fixed [#78](https://github.com/MichaelXF/js-confuser/issues/78)
+- - Object Extraction to not error on objects with spread elements
+
+- Fixed [#79](https://github.com/MichaelXF/js-confuser/issues/79)
+- - JsConfuser now supports `BigInt` literals
+
+- Fixed [#80](https://github.com/MichaelXF/js-confuser/issues/80)
+- - Rename Variables to not break code that had `var` and `let` variables in the same scope
+
+- Fixed [#81](https://github.com/MichaelXF/js-confuser/issues/81)
+- - Control Flow Flattening to not break `typeof` expressions
+
+- Fixed [#82](https://github.com/MichaelXF/js-confuser/issues/82)
+- - String Concealing to not break class constructors
+
 # `1.5.8`
 Several fixes
 

package/dist/index.js

@@ -37,6 +37,8 @@ var _object = require("./util/object");
 
 var _presets = _interopRequireDefault(require("./presets"));
 
+var _perf_hooks = require("perf_hooks");
+
 var assert = _interopRequireWildcard(require("assert"));
 
 var _options = require("./options");
@@ -103,7 +105,7 @@ var JsConfuser = async function (code, options) {
   return result;
 };
 
-var debugTransformations = async function debugTransformations(code, options) {
+const debugTransformations = async function (code, options) {
   (0, _options.validateOptions)(options);
   options = await (0, _options.correctOptions)(options);
   var frames = [];
@@ -121,21 +123,60 @@ var debugTransformations = async function debugTransformations(code, options) {
   await obfuscator.apply(tree, true);
   return frames;
 };
+/**
+ * This method is used by the obfuscator website to display a progress bar and additional information
+ * about the obfuscation.
+ *
+ * @param code - Source code to obfuscate
+ * @param options - Options
+ * @param callback - Progress callback, called after each transformation
+ * @returns
+ */
+
 
 exports.debugTransformations = debugTransformations;
 
-var debugObfuscation = async function debugTransformations(code, options, callback) {
+const debugObfuscation = async function (code, options, callback) {
+  const startTime = _perf_hooks.performance.now();
+
   (0, _options.validateOptions)(options);
   options = await (0, _options.correctOptions)(options);
+
+  const beforeParseTime = _perf_hooks.performance.now();
+
   var tree = (0, _parser.parseSync)(code);
+  const parseTime = _perf_hooks.performance.now() - beforeParseTime;
   var obfuscator = new _obfuscator.default(options);
   var totalTransforms = obfuscator.array.length;
+  var transformationTimes = Object.create(null);
+
+  var currentTransformTime = _perf_hooks.performance.now();
+
   obfuscator.on("debug", (name, tree, i) => {
+    var nowTime = _perf_hooks.performance.now();
+
+    transformationTimes[name] = nowTime - currentTransformTime;
+    currentTransformTime = nowTime;
     callback(name, i, totalTransforms);
   });
   await obfuscator.apply(tree, true);
-  var output = (0, _compiler.default)(tree, options);
-  return output;
+
+  const beforeCompileTime = _perf_hooks.performance.now();
+
+  var output = await (0, _compiler.default)(tree, options);
+  const compileTime = _perf_hooks.performance.now() - beforeCompileTime;
+
+  const endTime = _perf_hooks.performance.now();
+
+  return {
+    obfuscated: output,
+    transformationTimes: transformationTimes,
+    obfuscationTime: endTime - startTime,
+    parseTime: parseTime,
+    compileTime: compileTime,
+    totalTransforms: totalTransforms,
+    totalPossibleTransforms: obfuscator.totalPossibleTransforms
+  };
 };
 
 exports.debugObfuscation = debugObfuscation;

package/dist/obfuscator.js

@@ -94,18 +94,23 @@ class Obfuscator extends _events.EventEmitter {
 
     _defineProperty(this, "generated", void 0);
 
+    _defineProperty(this, "totalPossibleTransforms", void 0);
+
     this.varCount = 0;
     this.transforms = Object.create(null);
     this.generated = new Set();
+    this.totalPossibleTransforms = 0;
     this.push(new _preparation.default(this));
     this.push(new _renameLabels.default(this));
 
     const test = function (map) {
-      if ((0, _probability.isProbabilityMapProbable)(map)) {
-        for (var _len = arguments.length, transformers = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          transformers[_key - 1] = arguments[_key];
-        }
+      for (var _len = arguments.length, transformers = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        transformers[_key - 1] = arguments[_key];
+      }
 
+      _this.totalPossibleTransforms += transformers.length;
+
+      if ((0, _probability.isProbabilityMapProbable)(map)) {
         // options.verbose && console.log("+ Added " + transformer.name);
         transformers.forEach(Transformer => _this.push(new Transformer(_this)));
       } else {// options.verbose && console.log("- Skipped adding " + transformer.name);
@@ -137,7 +142,7 @@ class Obfuscator extends _events.EventEmitter {
     test(options.stack, _stack.default);
     test(true, _antiTooling.default);
     test(options.hideInitializingCode, _hideInitializingCode.default);
-    test(options.hexadecimalNumbers, _hexadecimalNumbers.default);
+    test(true, _hexadecimalNumbers.default); // BigInt support is included
 
     if (options.lock && Object.keys(options.lock).filter(x => x == "domainLock" ? options.lock.domainLock && options.lock.domainLock.length : options.lock[x]).length) {
       test(true, _lock.default);

package/dist/options.js

@@ -109,8 +109,7 @@ async function correctOptions(options) {
 
   if (options.lock && options.lock.selfDefending) {
     options.compact = true; // self defending forcibly enables this
-  } // options.globalVariables was never used.
-  // GlobalConcealing implicitly determines a global to be a variable referenced but never defined or modified.
+  } // options.globalVariables outlines generic globals that should be present in the execution context
 
 
   if (!options.hasOwnProperty("globalVariables")) {
@@ -124,7 +123,7 @@ async function correctOptions(options) {
       ["global", "Buffer", "require", "process", "__dirname", "__filename"].forEach(x => options.globalVariables.add(x));
     }
 
-    ["globalThis", "console", "parseInt", "parseFloat", "Math", "Promise", "String", "Boolean", "Function", "Object", "Array", "Proxy", "Error", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "setImmediate", "clearImmediate", "queueMicrotask", "exports", "module", "isNaN", "isFinite"].forEach(x => options.globalVariables.add(x));
+    ["globalThis", "console", "parseInt", "parseFloat", "Math", "Promise", "String", "Boolean", "Function", "Object", "Array", "Proxy", "Error", "TypeError", "ReferenceError", "RangeError", "EvalError", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "setImmediate", "clearImmediate", "queueMicrotask", "exports", "module", "isNaN", "isFinite", "Set", "Map", "WeakSet", "WeakMap", "Symbol"].forEach(x => options.globalVariables.add(x));
   }
 
   return options;

package/dist/order.js

@@ -33,9 +33,9 @@ exports.ObfuscateOrder = ObfuscateOrder;
   ObfuscateOrder[ObfuscateOrder["Shuffle"] = 24] = "Shuffle";
   ObfuscateOrder[ObfuscateOrder["NameRecycling"] = 25] = "NameRecycling";
   ObfuscateOrder[ObfuscateOrder["MovedDeclarations"] = 26] = "MovedDeclarations";
-  ObfuscateOrder[ObfuscateOrder["RenameVariables"] = 27] = "RenameVariables";
-  ObfuscateOrder[ObfuscateOrder["RenameLabels"] = 28] = "RenameLabels";
-  ObfuscateOrder[ObfuscateOrder["Minify"] = 30] = "Minify";
+  ObfuscateOrder[ObfuscateOrder["RenameLabels"] = 27] = "RenameLabels";
+  ObfuscateOrder[ObfuscateOrder["Minify"] = 28] = "Minify";
+  ObfuscateOrder[ObfuscateOrder["RenameVariables"] = 30] = "RenameVariables";
   ObfuscateOrder[ObfuscateOrder["ES5"] = 31] = "ES5";
   ObfuscateOrder[ObfuscateOrder["StringEncoding"] = 32] = "StringEncoding";
   ObfuscateOrder[ObfuscateOrder["AntiTooling"] = 34] = "AntiTooling";

package/dist/transforms/antiTooling.js

@@ -50,7 +50,7 @@ class AntiTooling extends _transform.default {
         if (flattened.length > 1) {
           flattened[0] = { ...flattened[0]
           };
-          this.replace(exprs[0], (0, _gen.ExpressionStatement)((0, _gen.UnaryExpression)((0, _random.choice)(["typeof", "void", "~", "!", "+"]), (0, _gen.SequenceExpression)(flattened))));
+          this.replace(exprs[0], (0, _gen.ExpressionStatement)((0, _gen.UnaryExpression)((0, _random.choice)(["typeof", "void", "!"]), (0, _gen.SequenceExpression)(flattened))));
           deleteExprs.push(...exprs.slice(1));
         }
 

package/dist/transforms/controlFlowFlattening/expressionObfuscation.js

@@ -30,7 +30,8 @@ class ExpressionObfuscation extends _transform.default {
         if (stmt.type == "ExpressionStatement") {
           var expr = stmt.expression;
 
-          if (expr.type == "UnaryExpression" && exprs.length) {
+          if (expr.type == "UnaryExpression" && !(expr.operator === "typeof" && expr.argument.type === "Identifier") && exprs.length // typeof is special
+          ) {
             expr.argument = (0, _gen.SequenceExpression)([...exprs, { ...expr.argument
             }]);
             deleteExprs.push(...exprs);
@@ -42,7 +43,8 @@ class ExpressionObfuscation extends _transform.default {
           if (exprs.length) {
             if (stmt.type == "IfStatement") {
               if (stmt.test.type == "BinaryExpression" && stmt.test.operator !== "**") {
-                if (stmt.test.left.type == "UnaryExpression") {
+                if (stmt.test.left.type == "UnaryExpression" && !(stmt.test.left.operator === "typeof" && stmt.test.left.argument.type === "Identifier") // typeof is special
+                ) {
                   stmt.test.left.argument = (0, _gen.SequenceExpression)([...exprs, { ...stmt.test.left.argument
                   }]);
                 } else {

package/dist/transforms/dispatcher.js

@@ -80,12 +80,12 @@ class Dispatcher extends _transform.default {
         } // Map of FunctionDeclarations
 
 
-        var functionDeclarations = {}; // Array of Identifier nodes
+        var functionDeclarations = Object.create(null); // Array of Identifier nodes
 
         var identifiers = [];
         var illegalFnNames = new Set(); // New Names for Functions
 
-        var newFnNames = {}; // [old name]: randomized name
+        var newFnNames = Object.create(null); // [old name]: randomized name
 
         var context = (0, _insert.isVarContext)(object) ? object : (0, _insert.getVarContext)(object, parents);
         (0, _traverse.walk)(object, parents, (o, p) => {
@@ -264,7 +264,7 @@ class Dispatcher extends _transform.default {
 
             var newName = newFnNames[o.name];
 
-            if (!newName) {
+            if (!newName || typeof newName !== "string") {
               return;
             }
 

package/dist/transforms/es5/antiClass.js

@@ -85,9 +85,13 @@ class AntiClass extends _transform.default {
               this.replace(o, (0, _gen.Identifier)(superName));
             }
           });
-        }
+        } // Support class fields
+
 
-        if (methodDefinition.kind == "constructor" || methodDefinition.kind == "method") {
+        if (methodDefinition.type === "PropertyDefinition") {
+          var assignmentExpression = (0, _gen.AssignmentExpression)("=", key, value || (0, _gen.Identifier)("undefined"));
+          pushingTo.push((0, _gen.ExpressionStatement)(assignmentExpression));
+        } else if (methodDefinition.kind == "constructor" || methodDefinition.kind == "method") {
           pushingTo.push((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", key, value)));
         } else if (methodDefinition.kind == "get" || methodDefinition.kind == "set") {
           var id = (0, _gen.Identifier)(methodDefinition.kind == "get" ? "getters" : "setters");

package/dist/transforms/es5/antiDestructuring.js

@@ -189,7 +189,7 @@ class AntiDestructuring extends _transform.default {
         var seq = (0, _gen.SequenceExpression)([(0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(temp), (0, _insert.clone)(extracting) || (0, _gen.Identifier)("undefined")), ...exprs]);
 
         if (object.type == "VariableDeclarator") {
-          var i = (0, _insert.getIndexDirect)(object, parents);
+          var i = (0, _insert.getIndexDirect)(object, parents[0]);
           var extra = Array.from(names).map(x => {
             return {
               type: "VariableDeclarator",

package/dist/transforms/eval.js

@@ -31,6 +31,17 @@ class Eval extends _transform.default {
   }
 
   transform(object, parents) {
+    // Don't apply to getter/setters or class methods
+    if (parents[0]) {
+      if (parents[0].type === "MethodDefinition" && parents[0].value === object) {
+        return;
+      }
+
+      if (parents[0].type === "Property" && parents[0].value === object && (parents[0].kind !== "init" || parents[0].method)) {
+        return;
+      }
+    }
+
     if (!(0, _probability.ComputeProbabilityMap)(this.options.eval, x => x, object.id && object.id.name)) {
       return;
     }

package/dist/transforms/extraction/duplicateLiteralsRemoval.js

@@ -113,7 +113,7 @@ class DuplicateLiteralsRemoval extends _transform.default {
       var body = [];
       var thisShift = (0, _random.getRandomInteger)(-250, 250); // the name of the getter
 
-      getterName = this.getPlaceholder();
+      getterName = this.getPlaceholder() + "_dLR_" + this.fnGetters.size;
 
       if (basedOn) {
         var shift = this.fnShifts.get(basedOn);
@@ -179,17 +179,17 @@ class DuplicateLiteralsRemoval extends _transform.default {
           this.arrayExpression = (0, _gen.ArrayExpression)([]);
         }
 
-        var first = this.first.get(value);
+        var firstLocation = this.first.get(value);
 
-        if (first) {
+        if (firstLocation) {
           this.first.set(value, null);
           var index = this.map.size;
           (0, _assert.ok)(!this.map.has(value));
           this.map.set(value, index);
-          this.toCaller(first[0], first[1], index);
           var pushing = (0, _insert.clone)(object);
           this.arrayExpression.elements.push(pushing);
           (0, _assert.ok)(this.arrayExpression.elements[index] === pushing);
+          this.toCaller(firstLocation[0], firstLocation[1], index);
         }
 
         var index = this.map.get(value);

package/dist/transforms/extraction/objectExtraction.js

@@ -97,7 +97,12 @@ class ObjectExtraction extends _transform.default {
               var nonInitOrComputed = object.properties.find(x => x.kind !== "init" || x.computed);
 
               if (nonInitOrComputed) {
-                this.log(name + " has non-init/computed property: " + nonInitOrComputed.key.name || nonInitOrComputed.key.value);
+                if (nonInitOrComputed.key) {
+                  this.log(name + " has non-init/computed property: " + nonInitOrComputed.key.name || nonInitOrComputed.key.value);
+                } else {
+                  this.log(name + " has spread-element or other type of property");
+                }
+
                 illegal.add(name);
                 return;
               } else {

package/dist/transforms/flatten.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _assert = require("assert");
+
 var _constants = require("../constants");
 
 var _order = require("../order");
@@ -39,6 +41,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  *   return [ref1, ref2, refN, returnValue];
  * }
  * ```
+ *
+ * Flatten is used to make functions eligible for the RGF transformation.
  */
 class Flatten extends _transform.default {
   constructor(o) {
@@ -46,15 +50,12 @@ class Flatten extends _transform.default {
 
     _defineProperty(this, "definedNames", void 0);
 
-    _defineProperty(this, "flatMapName", void 0);
-
-    _defineProperty(this, "flatNode", void 0);
+    _defineProperty(this, "flattenedFns", void 0);
 
     _defineProperty(this, "gen", void 0);
 
     this.definedNames = new Map();
-    this.flatMapName = null;
-    this.flatNode = null;
+    this.flattenedFns = [];
     this.gen = this.getGenerator();
   }
 
@@ -79,19 +80,43 @@ class Flatten extends _transform.default {
       }
     });
     super.apply(tree);
+
+    if (this.flattenedFns.length) {
+      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)(this.flattenedFns));
+    }
   }
 
   match(object, parents) {
-    return object.type == "FunctionDeclaration" && object.body.type == "BlockStatement" && !object.generator && !object.async && !object.params.find(x => x.type !== "Identifier");
+    return (object.type == "FunctionDeclaration" || object.type === "FunctionExpression") && object.body.type == "BlockStatement" && !object.generator && !object.params.find(x => x.type !== "Identifier");
   }
 
   transform(object, parents) {
     return () => {
-      //
-      if (parents.find(x => x.type == "ClassExpression" || x.type == "ClassDeclaration" || x.type == "MethodDefinition")) {
-        return;
+      var _object$id, _parents$, _parents$0$id, _parents$0$id2, _parents$2, _parents$3;
+
+      if (parents[0]) {
+        // Don't change class methods
+        if (parents[0].type === "MethodDefinition" && parents[0].value === object) {
+          return;
+        } // Don't change getter/setter methods
+
+
+        if (parents[0].type === "Property" && parents[0].value === object && parents[0].kind !== "init") {
+          return;
+        }
       }
 
+      (0, _assert.ok)(object.type === "FunctionDeclaration" || object.type === "FunctionExpression"); // The name is purely for debugging purposes
+
+      var currentFnName = object.type === "FunctionDeclaration" ? (_object$id = object.id) === null || _object$id === void 0 ? void 0 : _object$id.name : ((_parents$ = parents[0]) === null || _parents$ === void 0 ? void 0 : _parents$.type) === "VariableDeclarator" && ((_parents$0$id = parents[0].id) === null || _parents$0$id === void 0 ? void 0 : _parents$0$id.type) === "Identifier" && ((_parents$0$id2 = parents[0].id) === null || _parents$0$id2 === void 0 ? void 0 : _parents$0$id2.name);
+
+      if (((_parents$2 = parents[0]) === null || _parents$2 === void 0 ? void 0 : _parents$2.type) === "Property" && (_parents$3 = parents[0]) !== null && _parents$3 !== void 0 && _parents$3.key) {
+        var _parents$4, _parents$4$key, _parents$5, _parents$5$key;
+
+        currentFnName = currentFnName || String(((_parents$4 = parents[0]) === null || _parents$4 === void 0 ? void 0 : (_parents$4$key = _parents$4.key) === null || _parents$4$key === void 0 ? void 0 : _parents$4$key.name) || ((_parents$5 = parents[0]) === null || _parents$5 === void 0 ? void 0 : (_parents$5$key = _parents$5.key) === null || _parents$5$key === void 0 ? void 0 : _parents$5$key.value));
+      }
+
+      if (!currentFnName) currentFnName = "unnamed";
       var defined = new Set();
       var references = new Set();
       var modified = new Set();
@@ -119,9 +144,7 @@ class Flatten extends _transform.default {
 
           if (o.hidden) {
             illegal.add(o.name);
-          }
-
-          if (info.spec.isDefined) {
+          } else if (info.spec.isDefined) {
             defined.add(o.name);
           } else if (info.spec.isModified) {
             modified.add(o.name);
@@ -171,9 +194,6 @@ class Flatten extends _transform.default {
         return;
       }
 
-      illegal.forEach(name => {
-        defined.delete(name);
-      });
       defined.forEach(name => {
         references.delete(name);
         modified.delete(name);
@@ -186,65 +206,68 @@ class Flatten extends _transform.default {
       }
 
       var output = Array.from(modified);
-      var newName = this.gen.generate();
-      var valName = this.getPlaceholder();
+      var newName = this.getPlaceholder() + "_flat_" + currentFnName;
       var resultName = this.getPlaceholder();
       var propName = this.gen.generate();
+      var newOutputNames = Object.create(null);
+      output.forEach(name => {
+        newOutputNames[name] = this.gen.generate();
+      });
+      var returnOutputName = this.gen.generate();
       (0, _insert.getBlockBody)(object.body).push((0, _gen.ReturnStatement)());
       (0, _traverse.walk)(object.body, [object, ...parents], (o, p) => {
         return () => {
+          // Change return statements from
+          // return (argument)
+          // to
+          // return [ [modifiedRefs],  ]
           if (o.type == "ReturnStatement" && (0, _insert.getVarContext)(o, p) === object) {
-            var elements = output.map(_gen.Identifier);
+            var returnObject = (0, _gen.ObjectExpression)(output.map(outputName => (0, _gen.Property)((0, _gen.Literal)(newOutputNames[outputName]), (0, _gen.Identifier)(outputName), true)));
 
             if (o.argument && !(o.argument.type == "Identifier" && o.argument.name == "undefined")) {
-              elements.unshift((0, _insert.clone)(o.argument));
+              returnObject.properties.push((0, _gen.Property)((0, _gen.Literal)(returnOutputName), (0, _insert.clone)(o.argument), true));
             }
 
-            o.argument = (0, _gen.ArrayExpression)(elements);
-            o.argument = (0, _gen.AssignmentExpression)("=", (0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), o.argument);
+            o.argument = (0, _gen.AssignmentExpression)("=", (0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), returnObject);
           }
         };
       });
       var newBody = (0, _insert.getBlockBody)(object.body);
-      newBody.unshift((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)((0, _gen.ArrayPattern)([(0, _gen.ArrayPattern)(input.map(_gen.Identifier)), (0, _gen.ArrayPattern)((0, _insert.clone)(object.params)), (0, _gen.Identifier)(resultName)]), (0, _gen.Identifier)(valName))));
-
-      if (!this.flatMapName) {
-        this.flatMapName = this.getPlaceholder();
-        (0, _insert.prepend)(parents[parents.length - 1], (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.flatMapName, this.flatNode = (0, _gen.ObjectExpression)([]))));
-      }
-
-      var newFunctionExpression = (0, _gen.FunctionExpression)([(0, _gen.Identifier)(valName)], newBody);
+      var newFunctionExpression = (0, _gen.FunctionExpression)([(0, _gen.ArrayPattern)(input.map(_gen.Identifier)), (0, _gen.ArrayPattern)((0, _insert.clone)(object.params)), (0, _gen.Identifier)(resultName)], newBody);
       newFunctionExpression.async = !!object.async;
       newFunctionExpression.generator = !!object.generator;
       var property = (0, _gen.Property)((0, _gen.Identifier)(newName), newFunctionExpression, false);
       property.kind = "set";
-      this.flatNode.properties.push(property);
-      var identifier = (0, _gen.MemberExpression)((0, _gen.Identifier)(this.flatMapName), (0, _gen.Identifier)(newName), false);
-      var newParamNodes = object.params.map(() => (0, _gen.Identifier)(this.getPlaceholder())); // var result = newFn.call([...refs], ...arguments)
+      this.flattenedFns.push((0, _gen.VariableDeclarator)(newName, newFunctionExpression));
+      var newParamNodes = object.params.map(() => (0, _gen.Identifier)(this.getPlaceholder())); // result.pop()
 
-      var call = (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(resultName, (0, _gen.ArrayExpression)([])), (0, _gen.VariableDeclarator)("_", (0, _gen.AssignmentExpression)("=", identifier, (0, _gen.ArrayExpression)([(0, _gen.ArrayExpression)(input.map(_gen.Identifier)), (0, _gen.ArrayExpression)([...newParamNodes]), (0, _gen.Identifier)(resultName)])))]); // result.pop()
+      var getOutputMemberExpression = outputName => (0, _gen.MemberExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(propName), true), (0, _gen.Literal)(outputName), true); // newFn.call([...refs], ...arguments, resultObject)
 
-      var pop = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), (0, _gen.Literal)("pop"), true), []); // var result = newFn.call([...refs], ...arguments)
-      // modified1 = result.pop();
-      // modified2 = result.pop();
-      // ...modifiedN = result.pop();...
-      //
-      // return result.pop()
 
-      var newObjectBody = [call];
-      var outputReversed = [...output].reverse(); // DECOY STATEMENTS
+      var callExpression = (0, _gen.CallExpression)((0, _gen.Identifier)(newName), [(0, _gen.ArrayExpression)(input.map(_gen.Identifier)), (0, _gen.ArrayExpression)([...newParamNodes]), (0, _gen.Identifier)(resultName)]);
+      var newObjectBody = [// var resultObject = {};
+      (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(resultName, (0, _gen.ObjectExpression)([]))]), (0, _gen.ExpressionStatement)(newFunctionExpression.async ? (0, _gen.AwaitExpression)(callExpression) : callExpression)];
+      var outputReversed = [...output].reverse(); // realVar
+
+      outputReversed.forEach(outputName => {
+        newObjectBody.push((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(outputName), getOutputMemberExpression(newOutputNames[outputName]))));
+      }); // DECOY STATEMENTS
 
       var decoyKey = this.gen.generate();
-      var decoyNodes = [(0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ThrowStatement)((0, _gen.NewExpression)((0, _gen.Identifier)("Error"), [(0, _gen.Literal)(this.getPlaceholder())]))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(resultName))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(resultName))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(decoyKey), false), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(decoyKey), false))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false))])];
+      var decoyNodes = [// if (result.random) throw result.prop.random
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ThrowStatement)((0, _gen.NewExpression)((0, _gen.Identifier)("Error"), [getOutputMemberExpression(this.gen.generate())]))]), // if (result.random) return true;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.Literal)(true))]), // if (result.random) return result;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(resultName))]), // if (result.random) return result.random;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(decoyKey), true), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(decoyKey), true))]), // if(result.random1) return result.random2;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true))]), // if(result.random) return flatFn;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(newName))]), // if(result.random) flatFn = undefined;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(newName), (0, _gen.Identifier)("undefined")))]), // if(!result) return;
+      (0, _gen.IfStatement)((0, _gen.UnaryExpression)("!", (0, _gen.Identifier)(resultName)), [(0, _gen.ReturnStatement)()])].filter(() => Math.random() > 0.25); // if (result.output) return result.output.returnValue;
+      // this is the real return statement, it is always added
+
+      decoyNodes.push((0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(propName), true), [(0, _gen.ReturnStatement)(getOutputMemberExpression(returnOutputName))]));
       (0, _random.shuffle)(decoyNodes);
-      decoyNodes.forEach(decoyNode => {
-        if (Math.random() < 0.5) {
-          newObjectBody.push(decoyNode);
-        }
-      });
-      newObjectBody.push(...outputReversed.map(name => {
-        return (0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(name), (0, _insert.clone)(pop)));
-      }), (0, _gen.ReturnStatement)((0, _insert.clone)(pop)));
+      newObjectBody.push(...decoyNodes);
       object.body = (0, _gen.BlockStatement)(newObjectBody);
       object.params = newParamNodes;
     };

package/dist/transforms/hexadecimalNumbers.js

@@ -13,24 +13,49 @@ var _gen = require("../util/gen");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/**
+ * The HexadecimalNumbers transformation converts number literals into the hexadecimal form.
+ *
+ * This is done by replacing the number literal with an Identifier to ensure escodegen properly outputs it as such
+ *
+ * This transformation also handles BigInt support, so its always enabled for this reason.
+ */
 class HexadecimalNumbers extends _transform.default {
   constructor(o) {
     super(o, _order.ObfuscateOrder.HexadecimalNumbers);
   }
 
-  match(object, parents) {
+  isNumberLiteral(object) {
     return object.type === "Literal" && typeof object.value === "number" && Math.floor(object.value) === object.value;
   }
 
+  isBigIntLiteral(object) {
+    return object.type === "Literal" && typeof object.value === "bigint";
+  }
+
+  match(object, parents) {
+    return this.options.hexadecimalNumbers && this.isNumberLiteral(object) || this.isBigIntLiteral(object);
+  }
+
   transform(object, parents) {
-    return () => {
-      // Technically, a Literal will never be negative because it's supposed to be inside a UnaryExpression with a "-" operator.
-      // This code handles it regardless
-      var isNegative = object.value < 0;
-      var hex = Math.abs(object.value).toString(16);
-      var newStr = (isNegative ? "-" : "") + "0x" + hex;
-      this.replace(object, (0, _gen.Identifier)(newStr));
-    };
+    if (this.isNumberLiteral(object)) {
+      return () => {
+        // Technically, a Literal will never be negative because it's supposed to be inside a UnaryExpression with a "-" operator.
+        // This code handles it regardless
+        var isNegative = object.value < 0;
+        var hex = Math.abs(object.value).toString(16);
+        var newStr = (isNegative ? "-" : "") + "0x" + hex;
+        this.replace(object, (0, _gen.Identifier)(newStr));
+      };
+    } // https://github.com/MichaelXF/js-confuser/issues/79
+
+
+    if (this.isBigIntLiteral(object)) {
+      return () => {
+        // Use an Identifier with the raw string
+        this.replace(object, (0, _gen.Identifier)(object.raw));
+      };
+    }
   }
 
 }

package/dist/transforms/identifier/movedDeclarations.js

@@ -44,7 +44,7 @@ class MovedDeclarations extends _transform.default {
       var variableDeclarations = Object.create(null);
       (0, _traverse.walk)(object, parents, (o, p) => {
         if (o.type == "Identifier") {
-          if ((0, _scope.getLexicalScope)(o, p) !== object) {
+          if (o.hidden || (0, _scope.getLexicalScope)(o, p) !== object) {
             illegal.add(o.name);
           } else {
             var info = (0, _identifiers.getIdentifierInfo)(o, p);