js-confuser 1.2.2 → 1.4.2

package/dist/transforms/controlFlowFlattening/expressionObfuscation.js

@@ -80,6 +80,10 @@ class ExpressionObfuscation extends _transform.default {
               stmt.argument = (0, _gen.SequenceExpression)([...exprs, { ...stmt.argument
               }]);
               deleteExprs.push(...exprs);
+            } else if (stmt.type == "ReturnStatement") {
+              stmt.argument = (0, _gen.SequenceExpression)([...exprs, { ...(stmt.argument || (0, _gen.Identifier)("undefined"))
+              }]);
+              deleteExprs.push(...exprs);
             }
           }
 

package/dist/transforms/controlFlowFlattening/{switchCaseObfucation.js → switchCaseObfuscation.js}

@@ -35,7 +35,7 @@ class SwitchCaseObfuscation extends _transform.default {
     var types = new Set();
     (0, _traverse.walk)(object.discriminant, [object, ...parents], (o, p) => {
       if (o.type) {
-        if (o.type == "BinaryExpression" && o.operator === "+") {} else {
+        if (object.$controlFlowFlattening && o.type == "BinaryExpression" && o.operator === "+") {} else {
           types.add(o.type);
         }
       }
@@ -64,7 +64,7 @@ class SwitchCaseObfuscation extends _transform.default {
       return;
     }
 
-    var factor = (0, _random.getRandomInteger)(-250, 250);
+    var factor = (0, _random.getRandomInteger)(-150, 150);
 
     if (factor == 0) {
       factor = 2;

package/dist/transforms/deadCode.js

@@ -25,7 +25,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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; }
 
-const templates = [(0, _template.default)("\n  function curCSS( elem, name, computed ) {\n    var ret;\n  \n    computed = computed || getStyles( elem );\n  \n    if ( computed ) {\n      ret = computed.getPropertyValue( name ) || computed[ name ];\n  \n      if ( ret === \"\" && !isAttached( elem ) ) {\n        ret = redacted.style( elem, name );\n      }\n    }\n  \n    return ret !== undefined ?\n  \n      // Support: IE <=9 - 11+\n      // IE returns zIndex value as an integer.\n      ret + \"\" :\n      ret;\n  }"), (0, _template.default)("\n  function Example() {\n    var state = redacted.useState(false);\n    return x(\n      ErrorBoundary,\n      null,\n      x(\n        DisplayName,\n        null,\n      )\n    );\n  }"), (0, _template.default)("\n  const path = require('path');\nconst { version } = require('../../package');\nconst { version: dashboardPluginVersion } = require('@redacted/enterprise-plugin/package');\nconst { version: componentsVersion } = require('@redacted/components/package');\nconst { sdkVersion } = require('@redacted/enterprise-plugin');\nconst isStandaloneExecutable = require('../utils/isStandaloneExecutable');\nconst resolveLocalRedactedPath = require('./resolve-local-redacted-path');\n\nconst redactedPath = path.resolve(__dirname, '../redacted.js');"), (0, _template.default)("\nmodule.exports = async (resolveLocalRedactedPath = ()=>{throw new Error(\"No redacted path provided\")}) => {\n  const cliParams = new Set(process.argv.slice(2));\n  if (!cliParams.has('--version')) {\n    if (cliParams.size !== 1) return false;\n    if (!cliParams.has('-v')) return false;\n  }\n\n  const installationModePostfix = await (async (isStandaloneExecutable, redactedPath) => {\n    if (isStandaloneExecutable) return ' (standalone)';\n    if (redactedPath === (await resolveLocalRedactedPath())) return ' (local)';\n    return '';\n  })();\n\n  return true;\n};"), (0, _template.default)("\nfunction setCookie(cname, cvalue, exdays) {\n  var d = new Date();\n  d.setTime(d.getTime() + (exdays*24*60*60*1000));\n  var expires = \"expires=\"+ d.toUTCString();\n  document.cookie = cname + \"=\" + cvalue + \";\" + expires + \";path=/\";\n}"), (0, _template.default)("function getCookie(cname) {\n  var name = cname + \"=\";\n  var decodedCookie = decodeURIComponent(document.cookie);\n  var ca = decodedCookie.split(';');\n  for(var i = 0; i <ca.length; i++) {\n    var c = ca[i];\n    while (c.charAt(0) == ' ') {\n      c = c.substring(1);\n    }\n    if (c.indexOf(name) == 0) {\n      return c.substring(name.length, c.length);\n    }\n  }\n  return \"\";\n}"), (0, _template.default)("function getLocalStorageValue(key, cb){\n    if ( typeof key !== \"string\" ) {\n      throw new Error(\"Invalid data key provided (not type string)\")\n    }\n    if ( !key ) {\n      throw new Error(\"Invalid data key provided (empty string)\")\n    }\n    var value = window.localStorage.getItem(key)\n    try {\n      value = JSON.parse(value)\n    } catch ( e ) {\n      cb(new Error(\"Serialization error for data '\" + key + \"': \" + e.message))\n    }\n\n    cb(null, value)\n  }")];
+const templates = [(0, _template.default)("\n  function curCSS( elem, name, computed ) {\n    var ret;\n  \n    computed = computed || getStyles( elem );\n  \n    if ( computed ) {\n      ret = computed.getPropertyValue( name ) || computed[ name ];\n  \n      if ( ret === \"\" && !isAttached( elem ) ) {\n        ret = redacted.style( elem, name );\n      }\n    }\n  \n    return ret !== undefined ?\n  \n      // Support: IE <=9 - 11+\n      // IE returns zIndex value as an integer.\n      ret + \"\" :\n      ret;\n  }"), (0, _template.default)("\n  function Example() {\n    var state = redacted.useState(false);\n    return x(\n      ErrorBoundary,\n      null,\n      x(\n        DisplayName,\n        null,\n      )\n    );\n  }"), (0, _template.default)("\n  const path = require('path');\nconst { version } = require('../../package');\nconst { version: dashboardPluginVersion } = require('@redacted/enterprise-plugin/package');\nconst { version: componentsVersion } = require('@redacted/components/package');\nconst { sdkVersion } = require('@redacted/enterprise-plugin');\nconst isStandaloneExecutable = require('../utils/isStandaloneExecutable');\nconst resolveLocalRedactedPath = require('./resolve-local-redacted-path');\n\nconst redactedPath = path.resolve(__dirname, '../redacted.js');"), (0, _template.default)("\nmodule.exports = async (resolveLocalRedactedPath = ()=>{throw new Error(\"No redacted path provided\")}) => {\n  const cliParams = new Set(process.argv.slice(2));\n  if (!cliParams.has('--version')) {\n    if (cliParams.size !== 1) return false;\n    if (!cliParams.has('-v')) return false;\n  }\n\n  const installationModePostfix = await (async (isStandaloneExecutable, redactedPath) => {\n    if (isStandaloneExecutable) return ' (standalone)';\n    if (redactedPath === (await resolveLocalRedactedPath())) return ' (local)';\n    return '';\n  })();\n\n  return true;\n};"), (0, _template.default)("\nfunction setCookie(cname, cvalue, exdays) {\n  var d = new Date();\n  d.setTime(d.getTime() + (exdays*24*60*60*1000));\n  var expires = \"expires=\"+ d.toUTCString();\n  document.cookie = cname + \"=\" + cvalue + \";\" + expires + \";path=/\";\n}"), (0, _template.default)("function getCookie(cname) {\n  var name = cname + \"=\";\n  var decodedCookie = decodeURIComponent(document.cookie);\n  var ca = decodedCookie.split(';');\n  for(var i = 0; i <ca.length; i++) {\n    var c = ca[i];\n    while (c.charAt(0) == ' ') {\n      c = c.substring(1);\n    }\n    if (c.indexOf(name) == 0) {\n      return c.substring(name.length, c.length);\n    }\n  }\n  return \"\";\n}"), (0, _template.default)("function getLocalStorageValue(key, cb){\n    if ( typeof key !== \"string\" ) {\n      throw new Error(\"Invalid data key provided (not type string)\")\n    }\n    if ( !key ) {\n      throw new Error(\"Invalid data key provided (empty string)\")\n    }\n    var value = window.localStorage.getItem(key)\n    try {\n      value = JSON.parse(value)\n    } catch ( e ) {\n      cb(new Error(\"Serialization error for data '\" + key + \"': \" + e.message))\n    }\n\n    cb(null, value)\n  }"), (0, _template.default)("\n  \n    var __ = \"(c=ak(<~F$VU'9f)~><&85dBPL-module/from\";\n    var s = \"q:function(){var ad=ad=>b(ad-29);if(!T.r[(typeof ab==ad(123)?\";\n    var g = \"return U[c[c[d(-199)]-b(205)]]||V[ae(b(166))];case T.o[c[c[c[d(-199)]+d(-174)]-(c[b(119)]-(c[d(-199)]-163))]+ae(b(146))](0)==b(167)?d(-130):-d(-144)\";\n\n    __.match(s + g);\n  ")];
 /**
  * Adds dead code to blocks.
  *

package/dist/transforms/dispatcher.js

@@ -87,7 +87,7 @@ class Dispatcher extends _transform.default {
 
         var newFnNames = {}; // [old name]: randomized name
 
-        var context = (0, _insert.getVarContext)(object, parents);
+        var context = (0, _insert.isVarContext)(object) ? object : (0, _insert.getVarContext)(object, parents);
         (0, _traverse.walk)(object, parents, (o, p) => {
           if (object == o) {
             // Fix 1
@@ -102,7 +102,7 @@ class Dispatcher extends _transform.default {
 
           if (context === c) {
             if (o.type == "FunctionDeclaration" && o.id.name) {
-              if (p.find(x => x.$dispatcherSkip || x.type == "MethodDefinition") || o.body.type != "BlockStatement") {
+              if (o.$requiresEval || o.async || o.generator || p.find(x => x.$dispatcherSkip || x.type == "MethodDefinition") || o.body.type != "BlockStatement") {
                 illegalFnNames.add(name);
               }
 
@@ -114,10 +114,11 @@ class Dispatcher extends _transform.default {
               }
 
               (0, _traverse.walk)(o, p, (oo, pp) => {
-                if (oo.type == "Identifier" && oo.name == "arguments") {
-                  illegalFnNames.add(name);
-                } else if (oo.type == "ThisExpression") {
-                  illegalFnNames.add(name);
+                if (oo.type == "Identifier" && oo.name == "arguments" || oo.type == "ThisExpression" || oo.type == "Super") {
+                  if ((0, _insert.getVarContext)(oo, pp) === o) {
+                    illegalFnNames.add(name);
+                    return "EXIT";
+                  }
                 }
               });
               functionDeclarations[name] = [o, p];

package/dist/transforms/eval.js

@@ -27,7 +27,7 @@ class Eval extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _insert.isFunction)(object) && object.type != "ArrowFunctionExpression" && !object.$eval;
+    return (0, _insert.isFunction)(object) && object.type != "ArrowFunctionExpression" && !object.$eval && !object.$dispatcherSkip;
   }
 
   transform(object, parents) {

package/dist/transforms/extraction/duplicateLiteralsRemoval.js

@@ -78,7 +78,9 @@ class DuplicateLiteralsRemoval extends _transform.default {
     super.apply(tree);
 
     if (this.arrayName && this.arrayExpression.elements.length) {
-      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.arrayName, this.arrayExpression)));
+      var getArrayFn = this.getPlaceholder();
+      (0, _insert.append)(tree, (0, _gen.FunctionDeclaration)(getArrayFn, [], [(0, _gen.ReturnStatement)(this.arrayExpression)]));
+      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.arrayName, (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(getArrayFn), (0, _gen.Identifier)("call"), false), [(0, _gen.ThisExpression)()]))));
     }
   }
 
@@ -125,7 +127,7 @@ class DuplicateLiteralsRemoval extends _transform.default {
       }
 
       this.fnGetters.set(lexContext, getterName);
-      (0, _insert.prepend)(lexContext, (0, _gen.FunctionDeclaration)(getterName, [(0, _gen.Identifier)("index")], body));
+      (0, _insert.prepend)(lexContext, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(getterName, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.ReturnStatement)((0, _gen.FunctionExpression)([(0, _gen.Identifier)("index")], body))]), []))));
     }
 
     var theShift = this.fnShifts.get(getterName);

package/dist/transforms/hideInitializingCode.js

@@ -129,12 +129,15 @@ class HideInitializingCode extends _transform.default {
       });
       var map = new Map();
       var fnsToMake = (0, _random.getRandomInteger)(1, 5);
+      var numberLiteralsMade = 1;
 
       function numberLiteral(num, depth = 1) {
-        if (depth > 6 || Math.random() > 0.8 / depth) {
+        if (depth > 6 || Math.random() > 0.8 / depth || Math.random() > 80 / numberLiteralsMade) {
           return (0, _gen.Literal)(num);
         }
 
+        numberLiteralsMade++;
+
         function ternaryCall(name, param = (0, _random.getRandomInteger)(-250, 250)) {
           return (0, _gen.ConditionalExpression)((0, _gen.BinaryExpression)("==", (0, _gen.UnaryExpression)("typeof", (0, _gen.Identifier)(name)), (0, _gen.Literal)("function")), (0, _gen.CallExpression)((0, _gen.Identifier)(name), [numberLiteral(param, depth + 1)]), (0, _gen.Identifier)(name));
         }

package/dist/transforms/identifier/globalConcealing.js

@@ -140,8 +140,8 @@ class GlobalConcealing extends _transform.default {
         var getGlobalVariableFnName = this.getPlaceholder();
         var getThisVariableFnName = this.getPlaceholder(); // Returns global variable or fall backs to `this`
 
-        var getGlobalVariableFn = (0, _template.default)("\n        function ".concat(getGlobalVariableFnName, "(){\n          try {\n            return ").concat(global, ";\n          } catch (e){\n            return ").concat(getThisVariableFnName, "();\n          }\n        }")).single();
-        var getThisVariableFn = (0, _template.default)("\n        function ".concat(getThisVariableFnName, "(){\n          try {\n            return this;\n          } catch (e){\n            return null;\n          }\n        }")).single(); // 2. Replace old accessors
+        var getGlobalVariableFn = (0, _template.default)("\n        var ".concat(getGlobalVariableFnName, " = function(){\n          try {\n            return ").concat(global, ";\n          } catch (e){\n            return ").concat(getThisVariableFnName, "[\"call\"](this);\n          }\n        }")).single();
+        var getThisVariableFn = (0, _template.default)("\n        var ".concat(getThisVariableFnName, " = function(){\n          try {\n            return this;\n          } catch (e){\n            return null;\n          }\n        }")).single(); // 2. Replace old accessors
 
         var globalFn = this.getPlaceholder();
         var newNames = Object.create(null);
@@ -183,13 +183,23 @@ class GlobalConcealing extends _transform.default {
             newNames[name] = state;
           }
         });
-        (0, _insert.prepend)(object, (0, _gen.FunctionDeclaration)(globalFn, [(0, _gen.Identifier)("index")], [(0, _gen.SwitchStatement)((0, _gen.Identifier)("index"), Object.keys(newNames).map(name => {
+        var indexParamName = this.getPlaceholder();
+        var returnName = this.getPlaceholder();
+        var functionDeclaration = (0, _gen.FunctionDeclaration)(globalFn, [(0, _gen.Identifier)(indexParamName)], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(returnName)), (0, _gen.SwitchStatement)((0, _gen.Identifier)(indexParamName), Object.keys(newNames).map(name => {
           var code = newNames[name];
-          return (0, _gen.SwitchCase)((0, _gen.Literal)(code), [(0, _gen.ReturnStatement)((0, _gen.LogicalExpression)("||", (0, _gen.MemberExpression)((0, _gen.Identifier)(globalVar), (0, _gen.Literal)(name), true), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Literal)(name), true)))]);
-        }))]));
-        (0, _insert.prepend)(object, (0, _template.default)("\n          var ".concat(globalVar, " = ").concat(getGlobalVariableFnName, ".call(this), ").concat(thisVar, " = ").concat(getGlobalVariableFnName, ".call(this);\n          ")).single());
-        (0, _insert.prepend)(object, getGlobalVariableFn);
-        (0, _insert.prepend)(object, getThisVariableFn);
+          var body = [(0, _gen.ReturnStatement)((0, _gen.LogicalExpression)("||", (0, _gen.MemberExpression)((0, _gen.Identifier)(globalVar), (0, _gen.Literal)(name), true), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Literal)(name), true)))];
+
+          if (Math.random() > 0.5 && name) {
+            body = [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(returnName), (0, _gen.LogicalExpression)("||", (0, _gen.Literal)(name), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Literal)(name), true)))), (0, _gen.BreakStatement)()];
+          }
+
+          return (0, _gen.SwitchCase)((0, _gen.Literal)(code), body);
+        })), (0, _gen.ReturnStatement)((0, _gen.LogicalExpression)("||", (0, _gen.MemberExpression)((0, _gen.Identifier)(globalVar), (0, _gen.Identifier)(returnName), true), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Identifier)(returnName), true)))]);
+        var tempVar = this.getPlaceholder();
+        var variableDeclaration = (0, _template.default)("\n        var ".concat(globalVar, ", ").concat(thisVar, ";\n        ")).single();
+        variableDeclaration.declarations.push((0, _gen.VariableDeclarator)(tempVar, (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.FunctionExpression)([], [getGlobalVariableFn, getThisVariableFn, (0, _template.default)("return ".concat(thisVar, " = ").concat(getThisVariableFnName, "[\"call\"](this, ").concat(globalFn, "), ").concat(globalVar, " = ").concat(getGlobalVariableFnName, "[\"call\"](this)")).single()]), (0, _gen.Literal)("call"), true), [])));
+        (0, _insert.prepend)(object, variableDeclaration);
+        (0, _insert.append)(object, functionDeclaration);
       }
     };
   }

package/dist/transforms/identifier/variableAnalysis.js

@@ -100,7 +100,7 @@ class VariableAnalysis extends _transform.default {
           this.globals.add(o.name);
         }
 
-        var definingContexts = info.spec.isDefined ? [(0, _insert.getDefiningContext)(o, p)] : (0, _insert.getReferencingContexts)(o, p);
+        var definingContexts = info.spec.isDefined ? [(0, _insert.getDefiningContext)(o, p)] : (0, _insert.getReferencingContexts)(o, p, info);
         (0, _assert.ok)(definingContexts.length);
         definingContexts.forEach(definingContext => {
           (0, _assert.ok)((0, _insert.isContext)(definingContext), "".concat(definingContext.type, " is not a context"));

package/dist/transforms/label.js

@@ -27,7 +27,7 @@ class Label extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _compare.isLoop)(object);
+    return (0, _compare.isLoop)(object) || object.type == "BlockStatement" && parents[0] && parents[0].type == "LabeledStatement" && parents[0].body === object;
   }
 
   transform(object, parents) {
@@ -36,7 +36,16 @@ class Label extends _transform.default {
       var label = currentLabel || this.getPlaceholder();
       (0, _traverse.walk)(object, parents, (o, p) => {
         if (o.type == "BreakStatement" || o.type == "ContinueStatement") {
-          var loop = p.find(x => (0, _compare.isLoop)(x));
+          function isContinuableStatement(x) {
+            return (0, _compare.isLoop)(x) && x.type !== "SwitchStatement";
+          }
+
+          function isBreakableStatement(x) {
+            return (0, _compare.isLoop)(x) || o.label && x.type == "BlockStatement";
+          }
+
+          var fn = o.type == "ContinueStatement" ? isContinuableStatement : isBreakableStatement;
+          var loop = p.find(fn);
 
           if (object == loop) {
             if (!o.label) {

package/dist/transforms/lock/antiDebug.js

@@ -23,20 +23,31 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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 DevToolsDetection = (0, _template.default)("\n  function $jsc_debug(){\n\n    var isDev1 = !(\"\" + function() {/* Hello world */}).includes(\"/*\");\n    var s = \"s\";\n    while (isDev1) {\n      s = s + s;\n    }\n\n    var startTime = new Date();\n    debugger;\n    var endTime = new Date();\n    var isDev2 = endTime-startTime > 600;\n  \n    var a = \"a\";\n    while (isDev2) {\n      a = a + a;\n    }\n  \n  }\n  try {\n    if ( setInterval ) {\n      setInterval(()=>{\n        $jsc_debug();\n      }, 4000);\n    }\n  } catch ( e ) {\n\n  }\n \n");
+var DevToolsDetection = (0, _template.default)("\n  try {\n    if ( setInterval ) {\n      setInterval(()=>{\n        {functionName}();\n      }, 4000);\n    }\n  } catch ( e ) {\n\n  }\n");
 
 class AntiDebug extends _transform.default {
-  constructor(o) {
+  constructor(o, lock) {
     super(o, _order.ObfuscateOrder.Lock);
 
     _defineProperty(this, "made", void 0);
 
+    _defineProperty(this, "lock", void 0);
+
+    this.lock = lock;
     this.made = 0;
   }
 
   apply(tree) {
     super.apply(tree);
-    tree.body.unshift(...DevToolsDetection.compile());
+    var fnName = this.getPlaceholder();
+    var startTimeName = this.getPlaceholder();
+    var endTimeName = this.getPlaceholder();
+    var isDevName = this.getPlaceholder();
+    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...(0, _template.default)("\n      var ".concat(startTimeName, " = new Date();\n      debugger;\n      var ").concat(endTimeName, " = new Date();\n      var ").concat(isDevName, " = ").concat(endTimeName, "-").concat(startTimeName, " > 1000;\n      ")).compile(), (0, _gen.IfStatement)((0, _gen.Identifier)(isDevName), this.options.lock.countermeasures ? this.lock.getCounterMeasuresCode() : [(0, _gen.WhileStatement)((0, _gen.Identifier)(isDevName), [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(startTimeName), (0, _gen.Identifier)(endTimeName)))])], null)]);
+    tree.body.unshift(...DevToolsDetection.compile({
+      functionName: fnName
+    }));
+    tree.body.push(functionDeclaration);
   }
 
   match(object, parents) {
@@ -44,17 +55,25 @@ class AntiDebug extends _transform.default {
   }
 
   transform(object, parents) {
-    var body = (0, _insert.getBlockBody)(object.body);
-    [...body].forEach(stmt => {
-      if (Math.random() < 0.1 / (this.made || 1)) {
-        var index = (0, _random.getRandomInteger)(0, body.length);
-
-        if (body[index].type != "DebuggerStatement") {
-          body.splice(index, 0, (0, _gen.DebuggerStatement)());
-          this.made++;
+    return () => {
+      var body = (0, _insert.getBlockBody)(object.body);
+      [...body].forEach((stmt, i) => {
+        var addDebugger = Math.random() < 0.1 / (this.made || 1);
+
+        if (object.type == "Program" && i == 0) {
+          addDebugger = true;
+        }
+
+        if (addDebugger) {
+          var index = (0, _random.getRandomInteger)(0, body.length);
+
+          if (body[index].type != "DebuggerStatement") {
+            body.splice(index, 0, (0, _gen.DebuggerStatement)());
+            this.made++;
+          }
         }
-      }
-    });
+      });
+    };
   }
 
 }

package/dist/transforms/lock/lock.js

@@ -62,7 +62,7 @@ class Lock extends _transform.default {
     }
 
     if (this.options.lock.antiDebug) {
-      this.before.push(new _antiDebug.default(o));
+      this.before.push(new _antiDebug.default(o, this));
     }
 
     this.made = 0;
@@ -104,7 +104,7 @@ class Lock extends _transform.default {
       });
 
       if (!this.counterMeasuresNode) {
-        throw new Error("Countermeasures function named '" + this.options.lock.countermeasures + "' was not found. Names found: " + Array.from(defined).slice(0, 100).join(", "));
+        throw new Error("Countermeasures function named '" + this.options.lock.countermeasures + "' was not found.");
       }
     }
 
@@ -238,7 +238,7 @@ class Lock extends _transform.default {
         case "selfDefending":
           // A very simple mechanism inspired from https://github.com/javascript-obfuscator/javascript-obfuscator/blob/master/src/custom-code-helpers/self-defending/templates/SelfDefendingNoEvalTemplate.ts
           // regExp checks for a newline, formatters add these
-          var callExpression = (0, _template.default)("\n            (\n              function(){\n\n                var namedFunction = function(){\n                  const test= function(){\n                    const regExp=new RegExp('\\n');\n                    return regExp['test'](namedFunction)\n                  };\n                  return test()\n                }\n\n                return namedFunction();\n              }\n            )()\n            ").single().expression;
+          var callExpression = (0, _template.default)("\n            (\n              function(){\n                // Breaks JSNice.org, beautifier.io\n                var namedFunction = function(){\n                  const test = function(){\n                    const regExp=new RegExp('\\n');\n                    return regExp['test'](namedFunction)\n                  };\n                  return test()\n                }\n\n                return namedFunction();\n              }\n            )()\n            ").single().expression;
           nodes.push((0, _gen.IfStatement)(callExpression, this.getCounterMeasuresCode() || [], null));
           break;
 

package/dist/transforms/minify.js

@@ -314,7 +314,7 @@ class Minify extends _transform.default {
       if (last) {
         var lastStatement = last.consequent[last.consequent.length - 1];
 
-        if (lastStatement.type == "BreakStatement" && lastStatement.label == null) {
+        if (lastStatement && lastStatement.type == "BreakStatement" && lastStatement.label == null) {
           last.consequent.pop();
         }
       } else {
@@ -410,7 +410,7 @@ class Minify extends _transform.default {
         var key = object.callee.computed ? object.callee.property.value : object.callee.property.name;
 
         if (key == "toString" && object.arguments.length == 0) {
-          this.replace(object, (0, _gen.BinaryExpression)("+", (0, _insert.clone)(object.callee.object), (0, _gen.Literal)("")));
+          this.replace(object, (0, _gen.BinaryExpression)("+", (0, _gen.Literal)(""), (0, _insert.clone)(object.callee.object)));
         }
       }
     } // { "x": 1 } -> {x: 1}

package/dist/transforms/opaquePredicates.js

@@ -89,7 +89,8 @@ class OpaquePredicates extends _transform.default {
       if (!this.predicate) {
         this.predicateName = this.getPlaceholder();
         this.predicate = (0, _gen.ObjectExpression)([]);
-        (0, _insert.prepend)(parents[parents.length - 1] || object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.predicateName, this.predicate)));
+        var tempName = this.getPlaceholder();
+        (0, _insert.prepend)(parents[parents.length - 1] || object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.predicateName, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(tempName, this.predicate)), (0, _gen.ReturnStatement)((0, _gen.Identifier)(tempName))]), []))));
       }
 
       var expr = (0, _random.choice)(Object.values(this.predicates));
@@ -102,7 +103,8 @@ class OpaquePredicates extends _transform.default {
           case "array":
             var arrayProp = this.gen.generate();
             this.predicate.properties.push((0, _gen.Property)((0, _gen.Identifier)(arrayProp), (0, _gen.ArrayExpression)([])));
-            this.predicate.properties.push((0, _gen.Property)((0, _gen.Identifier)(prop), (0, _gen.FunctionExpression)([], (0, _template.default)("\n                  if ( !".concat(this.predicateName, ".").concat(arrayProp, "[0] ) {\n                    ").concat(this.predicateName, ".").concat(arrayProp, ".push(").concat((0, _random.getRandomInteger)(-100, 100), ");\n                  }\n                  return ").concat(this.predicateName, ".").concat(arrayProp, ".length;\n                ")).compile())));
+            var paramName = this.getPlaceholder();
+            this.predicate.properties.push((0, _gen.Property)((0, _gen.Identifier)(prop), (0, _gen.FunctionExpression)([(0, _gen.AssignmentPattern)((0, _gen.Identifier)(paramName), (0, _gen.Literal)("length"))], (0, _template.default)("\n                  if ( !".concat(this.predicateName, ".").concat(arrayProp, "[0] ) {\n                    ").concat(this.predicateName, ".").concat(arrayProp, ".push(").concat((0, _random.getRandomInteger)(-100, 100), ");\n                  }\n                  return ").concat(this.predicateName, ".").concat(arrayProp, "[").concat(paramName, "];\n                ")).compile())));
             expr = (0, _gen.CallExpression)(accessor, []);
             break;
 

package/dist/transforms/preparation/preparation.js

@@ -88,6 +88,14 @@ class ExplicitIdentifiers extends _transform.default {
   }
 
   transform(object, parents) {
+    if (object.name === "eval") {
+      var fn = (0, _insert.getFunction)(object, parents);
+
+      if (fn) {
+        fn.$requiresEval = true;
+      }
+    }
+
     var info = (0, _identifiers.getIdentifierInfo)(object, parents);
 
     if (info.isPropertyKey || info.isAccessor) {

package/dist/transforms/renameLabels.js

@@ -40,12 +40,25 @@ class RenameLabels extends _transform.default {
   transform(object, parents) {
     return () => {
       var newName = null;
+      var isRemovable = object.body.type !== "BlockStatement";
+      var labelNeverUsed = true;
       (0, _traverse.walk)(object, parents, (o, p) => {
         if (o.type == "BreakStatement" || o.type == "ContinueStatement") {
-          var labelStatement = p.find(x => (0, _compare.isLoop)(x));
+          function isContinuableStatement(x, stmtParents) {
+            return (0, _compare.isLoop)(x) && x.type !== "SwitchStatement";
+          }
+
+          function isBreakableStatement(x, stmtParents) {
+            return (0, _compare.isLoop)(x) || x.type == "BlockStatement" && o.label && stmtParents[0] && stmtParents[0].type == "LabeledStatement";
+          }
+
+          var fn = o.type == "ContinueStatement" ? isContinuableStatement : isBreakableStatement;
+          var labelStatement = p.find((node, i) => {
+            return fn(node, p.slice(i + 1));
+          });
 
           if (o.label && o.label.name == object.label.name) {
-            if (object.body == labelStatement) {
+            if (object.body == labelStatement && isRemovable) {
               // In same loop
               o.label = null;
             } else {
@@ -54,6 +67,7 @@ class RenameLabels extends _transform.default {
               }
 
               o.label = (0, _gen.Identifier)(newName);
+              labelNeverUsed = false;
             }
           }
         }
@@ -61,7 +75,7 @@ class RenameLabels extends _transform.default {
 
       if (newName) {
         object.label = (0, _gen.Identifier)(newName);
-      } else {
+      } else if (isRemovable || labelNeverUsed) {
         this.replace(object, (0, _insert.clone)(object.body));
       }
     };

package/dist/transforms/rgf.js

@@ -71,7 +71,7 @@ class RGF extends _transform.default {
       var names = new Map();
       var definingNodes = new Map();
       (0, _traverse.walk)(contextObject, contextParents, (object, parents) => {
-        if (object !== contextObject && (0, _insert.isFunction)(object) && !object.async && !object.generator && (0, _insert.getVarContext)(parents[0], parents.slice(1)) === contextObject) {
+        if (object !== contextObject && (0, _insert.isFunction)(object) && !object.$requiresEval && !object.async && !object.generator && (0, _insert.getVarContext)(parents[0], parents.slice(1)) === contextObject) {
           var defined = new Set(),
               referenced = new Set();
           var isBound = false;
@@ -79,9 +79,13 @@ class RGF extends _transform.default {
             if (o.type == "Identifier" && !_constants.reservedIdentifiers.has(o.name) && !this.options.globalVariables.has(o.name)) {
               var info = (0, _identifiers.getIdentifierInfo)(o, p);
 
+              if (!info.spec.isReferenced) {
+                return;
+              }
+
               if (info.spec.isDefined) {
                 defined.add(o.name);
-              } else if (info.spec.isReferenced || info.spec.isModified) {
+              } else {
                 referenced.add(o.name);
               }
             }
@@ -205,7 +209,8 @@ class RGF extends _transform.default {
           lock: {
             integrity: false
           },
-          eval: false
+          eval: false,
+          hideInitializingCode: false
         });
         var transforms = Object.values(obfuscator.transforms).filter(x => x.priority > this.priority);
         var embeddedFunction = { ...object,

package/dist/transforms/stack.js

@@ -37,7 +37,7 @@ class Stack extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _insert.isFunction)(object) && !object.params.find(x => x.type !== "Identifier") && object.body.type === "BlockStatement" && !parents.find(x => x.$dispatcherSkip);
+    return (0, _insert.isFunction)(object) && !object.params.find(x => x.type !== "Identifier") && object.body.type === "BlockStatement" && !parents.find(x => x.$dispatcherSkip) && !object.$requiresEval;
   }
 
   transform(object, parents) {

package/dist/transforms/string/encoding.js

@@ -129,6 +129,80 @@ const Encoding = {
       return o;
     },
     template: (0, _template.default)("\n    function {name}(s) {\n      var v,\n        x,\n        b = 0,\n        o = \"\",\n        len = s.length,\n        d = String,\n        e = \"charCodeAt\",\n        f = \"fromCharCode\", i;\n  \n      for (i = 0; i < len; i += 1) {\n        (v = s[e](i) - 33),\n          v >= 0 && v < 32\n            ? ((b += ((x = (x << 5) | v), 5)),\n              b >= 8\n                ? (b -= ((o += d[f]((x >> (b - 8)) & 0xff)), 8))\n                : 0)\n            : 0;\n      }\n      return o;\n    }\n    ")
+  },
+  hexTable: {
+    encode: function (str) {
+      var output = "";
+
+      for (var j = 0; j < str.length; j += 3) {
+        var chunk = str.substring(j, j + 3);
+
+        if (!chunk) {
+          continue;
+        }
+
+        chunk = chunk + "~";
+        var uniqueChars = new Set([]);
+
+        for (var char of chunk) {
+          uniqueChars.add(char);
+        }
+
+        var keys = Array.from(uniqueChars).sort();
+        var table = {},
+            i = 0;
+
+        for (var key of keys) {
+          table[key] = i++;
+        }
+
+        var idx = [];
+
+        for (var char of chunk) {
+          idx.push(table[char]);
+        }
+
+        var table64 = "0x";
+
+        for (var i = keys.length - 1; i >= 0; i--) {
+          table64 += keys[i].charCodeAt(0).toString(16).toUpperCase();
+        }
+
+        var idxInt = 0;
+
+        for (var i = idx.length - 1; i >= 0; i--) {
+          idxInt = idxInt << 3 | idx[i];
+        }
+
+        var idx64 = "0x" + idxInt.toString(16).toUpperCase(); // console.log(chunk, table, idx, table64, idx64);
+
+        output += table64 + "," + idx64 + ",";
+      }
+
+      if (output.endsWith(",")) {
+        output = output.substring(0, output.length - 1);
+      }
+
+      return "{" + output + "}";
+    },
+    decode: function (str) {
+      var output = "";
+      str = str.substring(1, str.length - 1);
+      var chunks = str.split(",");
+
+      for (var i = 0; i < chunks.length; i += 2) {
+        var arr = [chunks[i], chunks[i + 1]];
+        var [table, idx] = arr.map(Number); // console.log(table, idx);
+
+        while (idx) {
+          output += String.fromCharCode(table >> 8 * (idx & 7) & 0xff);
+          idx >>= 3;
+        }
+      }
+
+      return output.replace(/~/g, "");
+    },
+    template: (0, _template.default)("\n      function {name}(str){\n        var output = \"\";\n    \n        str = str.substring(1, str.length - 1);\n        var chunks = str.split(\",\");\n      \n        for (var i = 0; i < chunks.length; i += 2) {\n          var arr = [chunks[i], chunks[i + 1]];\n      \n          var [table, idx] = arr.map(Number);\n      \n          // console.log(table, idx);\n          while (idx) {\n            output += String.fromCharCode((table >> (8 * (idx & 7))) & 0xff);\n            idx >>= 3;\n          }\n        }\n      \n        return output.replace(/~/g, \"\");\n      }\n    \n    ")
   }
 };
 var _default = Encoding;

package/dist/transforms/string/stringCompression.js

@@ -94,14 +94,18 @@ class StringCompression extends _transform.default {
 
     var split = this.getPlaceholder();
     var decoder = this.getPlaceholder();
+    var getStringName = this.getPlaceholder();
     var encoded = LZ_encode(this.string);
 
     if (LZ_decode(encoded) !== this.string) {
       this.error(new Error("String failed to be decoded"));
     }
 
-    var callExpression = (0, _gen.CallExpression)((0, _gen.Identifier)(decoder), [(0, _gen.Literal)(encoded)]);
-    (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(split, callExpression)));
+    var getStringParamName = this.getPlaceholder();
+    var decoderParamName = this.getPlaceholder();
+    var callExpression = (0, _gen.CallExpression)((0, _gen.Identifier)(decoderParamName), [(0, _gen.CallExpression)((0, _gen.Identifier)(getStringParamName), [])]);
+    (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(split, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([(0, _gen.Identifier)(getStringParamName), (0, _gen.Identifier)(decoderParamName)], [(0, _gen.ReturnStatement)(callExpression)]), [(0, _gen.Identifier)(getStringName), (0, _gen.Identifier)(decoder)]))));
+    (0, _insert.append)(tree, (0, _gen.FunctionDeclaration)(getStringName, [], [(0, _gen.ReturnStatement)((0, _gen.Literal)(encoded))]));
     (0, _insert.append)(tree, (0, _gen.FunctionDeclaration)(this.fnName, [(0, _gen.Identifier)("index")], [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(split), (0, _gen.Identifier)("index"), true))]));
     (0, _insert.append)(tree, DecodeTemplate.single({
       name: decoder,

package/dist/transforms/string/stringConcealing.js

@@ -101,7 +101,7 @@ class StringConcealing extends _transform.default {
       (0, _insert.append)(tree, template.single({
         name: decodeFn
       }));
-      (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              }\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());
+      (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());
     });
     var flowIntegrity = this.getPlaceholder();
     (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(cacheName, (0, _gen.ArrayExpression)([])), (0, _gen.VariableDeclarator)(flowIntegrity, (0, _gen.Literal)(0)), (0, _gen.VariableDeclarator)(this.arrayName, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)("a", this.arrayExpression)), (0, _template.default)("return (".concat(flowIntegrity, " ? a.pop() : ").concat(flowIntegrity, "++, a)")).single()]), []))]));

package/dist/transforms/string/stringSplitting.js

@@ -21,6 +21,8 @@ var _compare = require("../../util/compare");
 
 var _assert = require("assert");
 
+var _probability = require("../../probability");
+
 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; }
@@ -81,6 +83,10 @@ class StringSplitting extends _transform.default {
         return;
       }
 
+      if (!(0, _probability.ComputeProbabilityMap)(this.options.stringSplitting, x => x, object.value)) {
+        return;
+      }
+
       var binaryExpression;
       var parent;
       var last = chunks.pop();