js-confuser 1.5.9 → 1.7.0

package/dist/transforms/string/stringCompression.js

@@ -23,6 +23,8 @@ var _transform = _interopRequireDefault(require("../transform"));
 
 var _stringConcealing = require("./stringConcealing");
 
+var _random = require("../../util/random");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -74,7 +76,7 @@ class StringCompression extends _transform.default {
 
     _defineProperty(this, "string", void 0);
 
-    _defineProperty(this, "delimiter", "1");
+    _defineProperty(this, "delimiter", "|");
 
     _defineProperty(this, "fnName", void 0);
 
@@ -98,7 +100,7 @@ class StringCompression extends _transform.default {
     var encoded = LZ_encode(this.string);
 
     if (LZ_decode(encoded) !== this.string) {
-      this.error(new Error("String failed to be decoded"));
+      this.error(new Error("String failed to be decoded. Try disabling the 'stringCompression' option."));
     }
 
     var getStringParamName = this.getPlaceholder();
@@ -130,33 +132,30 @@ class StringCompression extends _transform.default {
       return;
     }
 
-    if (!(0, _probability.ComputeProbabilityMap)(object.value, x => x)) {
+    if (!(0, _probability.ComputeProbabilityMap)(this.options.stringCompression, x => x, object.value)) {
       return;
-    }
+    } // HARD CODED LIMIT of 10,000 (after 1,000 elements)
 
-    var index = this.map.get(object.value);
+
+    if (this.map.size > 1000 && !(0, _random.chance)(this.map.size / 100)) return;
+    var index = this.map.get(object.value); // New string, add it!
 
     if (typeof index !== "number") {
+      // Ensure the string gets properly decoded
       if (LZ_decode(LZ_encode(object.value)) !== object.value) {
         this.ignore.add(object.value);
         return;
       }
 
-      var before = this.string;
       index = this.map.size;
       this.map.set(object.value, index);
-      this.string += object.value + this.delimiter; // allow rollback if string becomes corrupted
-
-      if (LZ_decode(LZ_encode(this.string)) !== this.string) {
-        this.string = before;
-        this.map.delete(object.value);
-        this.ignore.add(object.value);
-        return;
-      }
+      this.string += object.value + this.delimiter;
     }
 
     (0, _assert.ok)(typeof index === "number");
-    this.replaceIdentifierOrLiteral(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.fnName), [(0, _gen.Literal)(index)]), parents);
+    return () => {
+      this.replaceIdentifierOrLiteral(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.fnName), [(0, _gen.Literal)(index)]), parents);
+    };
   }
 
 }

package/dist/transforms/string/stringConcealing.js

@@ -26,6 +26,10 @@ var _transform = _interopRequireDefault(require("../transform"));
 
 var _encoding = _interopRequireDefault(require("./encoding"));
 
+var _probability = require("../../probability");
+
+var _bufferToString = require("../../templates/bufferToString");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -95,6 +99,11 @@ class StringConcealing extends _transform.default {
   apply(tree) {
     super.apply(tree);
     var cacheName = this.getPlaceholder();
+    var bufferToStringName = this.getPlaceholder(); // This helper functions convert UInt8 Array to UTf-string
+
+    (0, _insert.prepend)(tree, ..._bufferToString.BufferToStringTemplate.compile({
+      name: bufferToStringName
+    }));
     Object.keys(this.encoding).forEach(type => {
       var {
         template
@@ -102,7 +111,8 @@ class StringConcealing extends _transform.default {
       var decodeFn = this.getPlaceholder();
       var getterFn = this.encoding[type];
       (0, _insert.append)(tree, template.single({
-        name: decodeFn
+        name: decodeFn,
+        bufferToString: bufferToStringName
       }));
       (0, _insert.append)(tree, (0, _template.default)("\n            \n            function ".concat(getterFn, "(x, y, z, a = ").concat(decodeFn, ", b = ").concat(cacheName, "){\n              if ( z ) {\n                return y[").concat(cacheName, "[z]] = ").concat(getterFn, "(x, y);\n              } else if ( y ) {\n                [b, y] = [a(b), x || z]\n              }\n            \n              return y ? x[b[y]] : ").concat(cacheName, "[x] || (z=(b[x], a), ").concat(cacheName, "[x] = z(").concat(this.arrayName, "[x]))\n            }\n  \n            ")).single());
     });
@@ -122,12 +132,19 @@ class StringConcealing extends _transform.default {
       // Empty strings are discarded
       if (!object.value || this.ignore.has(object.value) || object.value.length == 0) {
         return;
-      }
+      } // Allow user to choose which strings get changed
+
+
+      if (!(0, _probability.ComputeProbabilityMap)(this.options.stringConcealing, x => x, object.value)) {
+        return;
+      } // HARD CODED LIMIT of 10,000 (after 1,000 elements)
+
 
+      if (this.set.size > 1000 && !(0, _random.chance)(this.set.size / 100)) return;
       var types = Object.keys(this.encoding);
       var type = (0, _random.choice)(types);
 
-      if (!type || !this.hasAllEncodings && Math.random() > 0.9) {
+      if (!type || !this.hasAllEncodings && (0, _random.chance)(10)) {
         var allowed = Object.keys(_encoding.default).filter(type => !this.encoding[type]);
 
         if (!allowed.length) {
@@ -165,16 +182,16 @@ class StringConcealing extends _transform.default {
       (0, _assert.ok)(index != -1, "index == -1");
       var callExpr = (0, _gen.CallExpression)((0, _gen.Identifier)(fnName), [(0, _gen.Literal)(index)]); // use `.apply` to fool automated de-obfuscators
 
-      if (Math.random() > 0.5) {
-        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("apply"), false), [(0, _gen.Identifier)("undefined"), (0, _gen.ArrayExpression)([(0, _gen.Literal)(index)])]);
+      if ((0, _random.chance)(10)) {
+        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Literal)("apply"), true), [(0, _gen.Identifier)("undefined"), (0, _gen.ArrayExpression)([(0, _gen.Literal)(index)])]);
       } // use `.call`
-      else if (Math.random() > 0.5) {
-        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("call"), false), [(0, _gen.Identifier)("undefined"), (0, _gen.Literal)(index)]);
+      else if ((0, _random.chance)(10)) {
+        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Literal)("call"), true), [(0, _gen.Identifier)("undefined"), (0, _gen.Literal)(index)]);
       }
 
       var referenceType = "call";
 
-      if (parents.length && Math.random() < 0.5 / this.variablesMade) {
+      if (parents.length && (0, _random.chance)(50 - this.variablesMade)) {
         referenceType = "constantReference";
       }
 

package/dist/transforms/string/stringEncoding.js

@@ -9,15 +9,15 @@ var _transform = _interopRequireDefault(require("../transform"));
 
 var _random = require("../../util/random");
 
-var _order = require("../../order");
-
 var _compare = require("../../util/compare");
 
 var _stringConcealing = require("./stringConcealing");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _probability = require("../../probability");
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+var _gen = require("../../util/gen");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function pad(x, len) {
   while (x.length < len) {
@@ -73,34 +73,23 @@ function toUnicodeRepresentation(str) {
 
 class StringEncoding extends _transform.default {
   constructor(o) {
-    super(o, _order.ObfuscateOrder.StringEncoding);
-
-    _defineProperty(this, "seen", void 0);
-  }
-
-  apply(tree) {
-    this.seen = new Set();
-    super.apply(tree);
+    super(o);
   }
 
   match(object, parents) {
-    return object.type == "Literal" && typeof object.value === "string" && !(0, _stringConcealing.isModuleSource)(object, parents) && !(0, _compare.isDirective)(object, parents);
+    return object.type == "Literal" && typeof object.value === "string" && object.value.length > 0 && !(0, _stringConcealing.isModuleSource)(object, parents) && !(0, _compare.isDirective)(object, parents);
   }
 
   transform(object, parents) {
-    // Todo fix circular json problems
-    if (this.seen.has(object)) {
-      return;
-    }
-
-    this.seen.add(object);
+    // Allow percentages
+    if (!(0, _probability.ComputeProbabilityMap)(this.options.stringEncoding, x => x, object.value)) return;
     var type = (0, _random.choice)(["hexadecimal", "unicode"]);
-    var escapedString = (type == "hexadecimal" ? toHexRepresentation : toUnicodeRepresentation)(object.value); // escodegen tries to escape backslashes, here is a work-around
+    var escapedString = (type == "hexadecimal" ? toHexRepresentation : toUnicodeRepresentation)(object.value);
+    return () => {
+      if (object.type !== "Literal") return; // ESCodeGen tries to escape backslashes, here is a work-around
 
-    this.replace(object, {
-      type: "Identifier",
-      name: "'".concat(escapedString, "'")
-    });
+      this.replace(object, (0, _gen.Identifier)("'".concat(escapedString, "'")));
+    };
   }
 
 }

package/dist/transforms/transform.js

@@ -81,10 +81,6 @@ class Transform {
   /**
    * Transforms to run after.
    */
-
-  /**
-   * Transformations to run at the same time (can cause conflicts so use sparingly)
-   */
   constructor(obfuscator) {
     let priority = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
 
@@ -98,15 +94,12 @@ class Transform {
 
     _defineProperty(this, "after", void 0);
 
-    _defineProperty(this, "concurrent", void 0);
-
     (0, _assert.ok)(obfuscator instanceof _obfuscator.default, "obfuscator should be an Obfuscator");
     this.obfuscator = obfuscator;
     this.options = this.obfuscator.options;
     this.priority = priority;
     this.before = [];
     this.after = [];
-    this.concurrent = [];
   }
   /**
    * The transformation name.
@@ -136,12 +129,12 @@ class Transform {
 
 
     this.before.forEach(x => x.apply(tree));
-    (0, _traverse.default)(tree, (object, parents) => {
-      var fns = [];
-      fns.push(this.input(object, parents)); // Fix 1. Increase performance with multiple transforms on one iteration.
+    /**
+     * Run this transformation
+     */
 
-      this.concurrent.forEach(x => fns.push(x.input(object, parents)));
-      return () => fns.forEach(x => x && x());
+    (0, _traverse.default)(tree, (object, parents) => {
+      return this.input(object, parents);
     });
     /**
      * Cleanup transformations
@@ -202,18 +195,17 @@ class Transform {
   getPlaceholder() {
     const genRanHex = size => [...Array(size)].map(() => Math.floor(Math.random() * 10).toString(10)).join("");
 
-    return "__p_" + genRanHex(10);
+    return _constants.placeholderVariablePrefix + genRanHex(10);
   }
   /**
    * Returns an independent name generator with it's own counter.
-   * @param offset
+   * @param overrideMode - Override the user's `identifierGenerator` option
    * @returns
    */
 
 
-  getGenerator() {
-    let offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    var count = offset;
+  getGenerator(overrideMode) {
+    var count = 0;
     var identifiers = new Set();
     return {
       generate: () => {
@@ -221,7 +213,7 @@ class Transform {
 
         do {
           count++;
-          retValue = this.generateIdentifier(-1, count);
+          retValue = this.generateIdentifier(-1, count, overrideMode);
         } while (identifiers.has(retValue));
 
         identifiers.add(retValue);
@@ -239,6 +231,7 @@ class Transform {
   generateIdentifier() {
     let length = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
     let count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
+    let overrideMode = arguments.length > 2 ? arguments[2] : undefined;
 
     if (length == -1) {
       length = (0, _random.getRandomInteger)(6, 8);
@@ -255,7 +248,7 @@ class Transform {
     var identifier;
 
     do {
-      identifier = (0, _probability.ComputeProbabilityMap)(this.options.identifierGenerator, function () {
+      identifier = (0, _probability.ComputeProbabilityMap)(overrideMode || this.options.identifierGenerator, function () {
         let mode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "randomized";
 
         switch (mode) {

package/dist/traverse.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.assertNoCircular = assertNoCircular;
 exports.default = traverse;
 exports.getBlock = getBlock;
 exports.isBlock = isBlock;
 exports.walk = walk;
 
-var _identifiers = require("./util/identifiers");
-
 /**
  * A block refers to any object that has a **`.body`** property where code is nested.
  *
@@ -41,12 +40,10 @@ function isBlock(object) {
 
 function walk(object, parents, onEnter) {
   if (typeof object === "object" && object) {
-    var newParents = [object, ...parents];
-
-    if (!Array.isArray(object)) {
-      (0, _identifiers.validateChain)(object, parents);
-    } // 1. Call `onEnter` function and remember any onExit callback returned
-
+    var newParents = [object, ...parents]; // if (!Array.isArray(object)) {
+    //   validateChain(object, parents);
+    // }
+    // 1. Call `onEnter` function and remember any onExit callback returned
 
     var onExit = onEnter(object, parents); // 2. Traverse children
 
@@ -58,8 +55,6 @@ function walk(object, parents, onEnter) {
           return "EXIT";
         }
       }
-
-      copy.forEach(x => {});
     } else {
       var keys = Object.keys(object);
 
@@ -100,4 +95,23 @@ function walk(object, parents, onEnter) {
 
 function traverse(tree, onEnter) {
   walk(tree, [], onEnter);
+}
+/**
+ * This is debugging function used to test for circular references.
+ */
+
+
+function assertNoCircular(object) {
+  var seen = new Set();
+  traverse(object, (node, nodeParents) => {
+    if (node && typeof node === "object") {
+      if (seen.has(node)) {
+        console.log(nodeParents);
+        console.log(node);
+        throw new Error("FOUND CIRCULAR REFERENCE");
+      }
+
+      seen.add(node);
+    }
+  });
 }

package/dist/util/gen.js

@@ -15,6 +15,7 @@ exports.BreakStatement = BreakStatement;
 exports.CallExpression = CallExpression;
 exports.CatchClause = CatchClause;
 exports.ClassDeclaration = ClassDeclaration;
+exports.ClassExpression = ClassExpression;
 exports.ConditionalExpression = ConditionalExpression;
 exports.DebuggerStatement = DebuggerStatement;
 exports.ExpressionStatement = ExpressionStatement;
@@ -174,6 +175,7 @@ function BreakStatement(label) {
 
 function Property(key, value) {
   let computed = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  let kind = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "init";
 
   if (!key) {
     throw new Error("key is undefined");
@@ -188,7 +190,7 @@ function Property(key, value) {
     key: key,
     computed: computed,
     value: value,
-    kind: "init",
+    kind: kind,
     method: false,
     shorthand: false
   };
@@ -537,6 +539,20 @@ function ClassDeclaration(id) {
   };
 }
 
+function ClassExpression(id) {
+  let superClass = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  let body = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  return {
+    type: "ClassExpression",
+    id: id,
+    superClass: superClass,
+    body: {
+      type: "ClassBody",
+      body: body
+    }
+  };
+}
+
 function ThrowStatement(argument) {
   return {
     type: "ThrowStatement",

package/dist/util/identifiers.js

@@ -42,6 +42,22 @@ function validateChain(object, parents) {
     }
   }
 }
+
+function objectPatternCheck(object, parents) {
+  var objectPatternIndex = parents.findIndex(x => x.type === "ObjectPattern");
+
+  if (objectPatternIndex == -1) {
+    return true;
+  }
+
+  var property = parents[objectPatternIndex].properties.find(property => parents[objectPatternIndex - 2] === property);
+
+  if (property.key === (parents[objectPatternIndex - 3] || object)) {
+    return false;
+  }
+
+  return true;
+}
 /**
  * Returns detailed information about the given Identifier node.
  * @param object
@@ -70,11 +86,29 @@ function getIdentifierInfo(object, parents) {
   }
 
   var varIndex = parents.findIndex(x => x.type == "VariableDeclarator");
-  var isVariableDeclaration = varIndex != -1 && parents[varIndex].id == (parents[varIndex - 1] || object) && parents.find(x => x.type == "VariableDeclaration");
+  var isVariableDeclaration = varIndex != -1 && parents[varIndex].id == (parents[varIndex - 1] || object) && parents.find(x => x.type == "VariableDeclaration") && objectPatternCheck(object, parents); // Assignment pattern check!
+
+  if (isVariableDeclaration) {
+    var slicedParents = parents.slice(0, varIndex - 1);
+    var i = 0;
+
+    for (var parent of slicedParents) {
+      var childNode = slicedParents[i - 1] || object;
+
+      if (parent.type === "AssignmentPattern" && parent.right === childNode) {
+        isVariableDeclaration = false;
+        break;
+      }
+
+      i++;
+    }
+  }
+
   var forIndex = parents.findIndex(x => x.type == "ForStatement");
   var isForInitializer = forIndex != -1 && parents[forIndex].init == (parents[forIndex - 1] || object);
   var functionIndex = parents.findIndex(x => (0, _insert.isFunction)(x));
   var isFunctionDeclaration = functionIndex != -1 && parents[functionIndex].type == "FunctionDeclaration" && parents[functionIndex].id == object;
+  var isNamedFunctionExpression = functionIndex != -1 && parents[functionIndex].type === "FunctionExpression" && parents[functionIndex].id === object;
   var isAFunctionParameter = isFunctionParameter(object, parents);
   var isClauseParameter = false; // Special case for Catch clauses
 
@@ -90,7 +124,7 @@ function getIdentifierInfo(object, parents) {
   var isFunctionCall = parent.callee == object; // NewExpression and CallExpression
 
   var assignmentIndex = parents.findIndex(p => p.type === "AssignmentExpression");
-  var isAssignmentLeft = assignmentIndex !== -1 && parents[assignmentIndex].left === (parents[assignmentIndex - 1] || object);
+  var isAssignmentLeft = assignmentIndex !== -1 && parents[assignmentIndex].left === (parents[assignmentIndex - 1] || object) && objectPatternCheck(object, parents);
   var isAssignmentValue = assignmentIndex !== -1 && parents[assignmentIndex].right === (parents[assignmentIndex - 1] || object);
   var isUpdateExpression = parent.type == "UpdateExpression";
   var isClassDeclaration = (parent.type == "ClassDeclaration" || parent.type == "ClassExpression") && parent.id == object;
@@ -227,7 +261,7 @@ function getIdentifierInfo(object, parents) {
       /**
        * Is the Identifier defined, i.e a variable declaration, function declaration, parameter, or class definition
        */
-      isDefined: isVariableDeclaration || isFunctionDeclaration || isAFunctionParameter || isClassDeclaration || isClauseParameter || isMethodDefinition || isImportSpecifier,
+      isDefined: isVariableDeclaration || isFunctionDeclaration || isNamedFunctionExpression || isAFunctionParameter || isClassDeclaration || isClauseParameter || isMethodDefinition || isImportSpecifier,
 
       /**
        * Is the Identifier modified, either by an `AssignmentExpression` or `UpdateExpression`

package/dist/util/insert.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.append = append;
 exports.clone = clone;
+exports.computeFunctionLength = computeFunctionLength;
 exports.deleteDeclaration = deleteDeclaration;
 exports.deleteDirect = deleteDirect;
 exports.getAllDefiningContexts = getAllDefiningContexts;
@@ -168,15 +169,14 @@ function getAllDefiningContexts(o, p) {
 
   if (info.isFunctionParameter) {
     // Get Function
-    var fn = getFunction(o, p);
-    contexts.push(fn.body);
+    var fn = getFunction(o, p); // contexts.push(fn.body);
   }
 
   if (info.isClauseParameter) {
     var catchClause = p.find(x => x.type === "CatchClause");
 
     if (catchClause) {
-      contexts.push(catchClause.body);
+      return [catchClause];
     }
   }
 
@@ -306,8 +306,18 @@ function prepend(block) {
       }
     });
     block.body.splice(moveBy, 0, ...nodes);
+  } else if (block.type === "SwitchCase") {
+    block.consequent.unshift(...nodes);
   } else {
-    getBlockBody(block).unshift(...nodes);
+    var bodyArray = getBlockBody(block); // Check for 'use strict'
+
+    if (bodyArray[0] && bodyArray[0].directive) {
+      // Insert under 'use strict' directive
+      bodyArray.splice(1, 0, ...nodes);
+    } else {
+      // Prepend at the top of the block
+      bodyArray.unshift(...nodes);
+    }
   }
 }
 
@@ -378,4 +388,25 @@ function isForInitialize(o, p) {
   }
 
   return false;
+}
+/**
+ * Computes the `function.length` property given the parameter nodes.
+ *
+ * @param params
+ * @returns
+ */
+
+
+function computeFunctionLength(params) {
+  var count = 0;
+
+  for (var parameterNode of params) {
+    if (parameterNode.type === "Identifier" || parameterNode.type === "ObjectPattern" || parameterNode.type === "ArrayPattern") {
+      count++;
+    } else {
+      break;
+    }
+  }
+
+  return count;
 }

package/dist/util/random.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.alphabeticalGenerator = alphabeticalGenerator;
+exports.chance = chance;
 exports.choice = choice;
 exports.getRandom = getRandom;
 exports.getRandomFalseExpression = getRandomFalseExpression;
@@ -17,10 +18,24 @@ var _assert = require("assert");
 
 var _gen = require("./gen");
 
+/**
+ * Returns a random element from the given array
+ * @param choices Array of items
+ * @returns One of the items in the array at random
+ */
 function choice(choices) {
   var index = Math.floor(Math.random() * choices.length);
   return choices[index];
 }
+/**
+ * Returns a true/false based on the percent chance (0%-100%)
+ * @param percentChance AS A PERCENTAGE 0 - 100%
+ */
+
+
+function chance(percentChance) {
+  return Math.random() < percentChance / 100;
+}
 /**
  * **Mutates the given array**
  * @param array