js-confuser 1.4.2 → 1.4.3

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+<!-- # `1.5.0`
+Hexadecimal Numbers
+
+- The hexadecimal representation can now be used. [#29](https://github.com/MichaelXF/js-confuser/issues/29)
+- New option `hexadecimalNumbers` to control this behavior.
+
+### `hexadecimalNumbers`
+
+Uses the hexadecimal representation (`50` -> `0x32`) for numbers. (`true/false`) -->
+
+# `1.4.3`
+Minify Fix
+
+- Fixed [#34](https://github.com/MichaelXF/js-confuser/issues/34)
+- - Minify was removing `return` statements too aggressively, fixed in this version.
+
+- Slight improvement to Control Flow Flattening
+
 # `1.4.2`
 Eval Fix
 

package/README.md

@@ -115,6 +115,10 @@ JsConfuser.obfuscate(`<source code>`, {
 
 Remove's whitespace from the final output. Enabled by default. (`true/false`)
 
+<!-- ### `hexadecimalNumbers`
+
+Uses the hexadecimal representation (`50` -> `0x32`) for numbers. (`true/false`) -->
+
 ### `minify`
 
 Minifies redundant code. (`true/false`)

package/dist/compiler.js

@@ -14,7 +14,8 @@ async function compileJs(tree, options) {
 
 function compileJsSync(tree, options) {
   var api = {
-    format: escodegen.FORMAT_MINIFY
+    format: { ...escodegen.FORMAT_MINIFY
+    }
   };
 
   if (!options.compact) {

package/dist/obfuscator.js

@@ -67,6 +67,8 @@ var _antiTooling = _interopRequireDefault(require("./transforms/antiTooling"));
 
 var _hideInitializingCode = _interopRequireDefault(require("./transforms/hideInitializingCode"));
 
+var _hexadecimalNumbers = _interopRequireDefault(require("./transforms/hexadecimalNumbers"));
+
 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; }
@@ -128,6 +130,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);
 
     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

@@ -12,7 +12,7 @@ var _presets = _interopRequireDefault(require("./presets"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const validProperties = new Set(["preset", "target", "indent", "compact", "minify", "es5", "renameVariables", "renameGlobals", "identifierGenerator", "nameRecycling", "controlFlowFlattening", "hideInitializingCode", "globalConcealing", "stringCompression", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "eval", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "shuffle", "stack", "verbose", "globalVariables", "debugComments"]);
+const validProperties = new Set(["preset", "target", "indent", "compact", "hexadecimalNumbers", "minify", "es5", "renameVariables", "renameGlobals", "identifierGenerator", "nameRecycling", "controlFlowFlattening", "hideInitializingCode", "globalConcealing", "stringCompression", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "eval", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "shuffle", "stack", "verbose", "globalVariables", "debugComments"]);
 const validOses = new Set(["windows", "linux", "osx", "ios", "android"]);
 const validBrowsers = new Set(["firefox", "chrome", "iexplorer", "edge", "safari", "opera"]);
 

package/dist/order.js

@@ -39,4 +39,5 @@ exports.ObfuscateOrder = ObfuscateOrder;
   ObfuscateOrder[ObfuscateOrder["ES5"] = 31] = "ES5";
   ObfuscateOrder[ObfuscateOrder["StringEncoding"] = 32] = "StringEncoding";
   ObfuscateOrder[ObfuscateOrder["AntiTooling"] = 34] = "AntiTooling";
+  ObfuscateOrder[ObfuscateOrder["HexadecimalNumbers"] = 35] = "HexadecimalNumbers";
 })(ObfuscateOrder || (exports.ObfuscateOrder = ObfuscateOrder = {}));

package/dist/presets.js

@@ -33,6 +33,7 @@ const highPreset = {
   preset: "high",
   calculator: true,
   compact: true,
+  hexadecimalNumbers: false,
   controlFlowFlattening: 0.75,
   deadCode: 0.2,
   dispatcher: true,
@@ -69,6 +70,7 @@ const mediumPreset = {
   preset: "medium",
   calculator: true,
   compact: true,
+  hexadecimalNumbers: false,
   controlFlowFlattening: 0.5,
   deadCode: 0.025,
   dispatcher: 0.75,
@@ -96,6 +98,7 @@ const lowPreset = {
   preset: "low",
   calculator: true,
   compact: true,
+  hexadecimalNumbers: false,
   controlFlowFlattening: 0.25,
   deadCode: 0.01,
   dispatcher: 0.5,

package/dist/transforms/controlFlowFlattening/controlFlowFlattening.js

@@ -193,6 +193,8 @@ class ControlFlowFlattening extends _transform.default {
 
       var resultVar = this.getPlaceholder();
       var argVar = this.getPlaceholder();
+      var testVar = this.getPlaceholder();
+      var needsTestVar = false;
       var needsResultAndArgVar = false;
       var fnToLabel = Object.create(null);
       fnNames.forEach(fnName => {
@@ -364,7 +366,10 @@ class ControlFlowFlattening extends _transform.default {
 
 
                 finishCurrentChunk(isPostTest ? bodyPath : testPath, testPath);
-                currentBody.push((0, _gen.IfStatement)(control.test || (0, _gen.Literal)(true), [{
+                currentBody.push((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(testVar), control.test || (0, _gen.Literal)(true))));
+                needsTestVar = true;
+                finishCurrentChunk();
+                currentBody.push((0, _gen.IfStatement)((0, _gen.Identifier)(testVar), [{
                   type: "GotoStatement",
                   label: bodyPath
                 }])); // create new label called `bodyPath` and have test body point to afterPath (goto afterPath)
@@ -388,13 +393,16 @@ class ControlFlowFlattening extends _transform.default {
           }
 
           if (stmt.type == "IfStatement" && stmt.consequent.type == "BlockStatement" && (!stmt.alternate || stmt.alternate.type == "BlockStatement")) {
+            finishCurrentChunk();
+            currentBody.push((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(testVar), stmt.test)));
+            needsTestVar = true;
             finishCurrentChunk();
             var hasAlternate = !!stmt.alternate;
             (0, _assert.ok)(!(hasAlternate && stmt.alternate.type !== "BlockStatement"));
             var yesPath = this.getPlaceholder();
             var noPath = this.getPlaceholder();
             var afterPath = this.getPlaceholder();
-            currentBody.push((0, _gen.IfStatement)(stmt.test, [{
+            currentBody.push((0, _gen.IfStatement)((0, _gen.Identifier)(testVar), [{
               type: "GotoStatement",
               label: yesPath
             }]));
@@ -658,6 +666,10 @@ class ControlFlowFlattening extends _transform.default {
       }));
       var declarations = [];
 
+      if (needsTestVar) {
+        declarations.push((0, _gen.VariableDeclarator)(testVar));
+      }
+
       if (needsResultAndArgVar) {
         declarations.push((0, _gen.VariableDeclarator)(resultVar));
         declarations.push((0, _gen.VariableDeclarator)(argVar));

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  }"), (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  ")];
+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  "), (0, _template.default)("\n  function vec_pack(vec) {\n    return vec[1] * 67108864 + (vec[0] < 0 ? 33554432 | vec[0] : vec[0]);\n  }\n  \n  function vec_unpack(number) {\n    switch (((number & 33554432) !== 0) * 1 + (number < 0) * 2) {\n      case 0:\n        return [number % 33554432, Math.trunc(number / 67108864)];\n      case 1:\n        return [\n          (number % 33554432) - 33554432,\n          Math.trunc(number / 67108864) + 1,\n        ];\n      case 2:\n        return [\n          (((number + 33554432) % 33554432) + 33554432) % 33554432,\n          Math.round(number / 67108864),\n        ];\n      case 3:\n        return [number % 33554432, Math.trunc(number / 67108864)];\n    }\n  }\n  \n  let a = vec_pack([2, 4]);\n  let b = vec_pack([1, 2]);\n  \n  let c = a + b; // Vector addition\n  let d = c - b; // Vector subtraction\n  let e = d * 2; // Scalar multiplication\n  let f = e / 2; // Scalar division\n  \n  console.log(vec_unpack(c)); // [3, 6]\n  console.log(vec_unpack(d)); // [2, 4]\n  console.log(vec_unpack(e)); // [4, 8]\n  console.log(vec_unpack(f)); // [2, 4]\n  "), (0, _template.default)("\n  function buildCharacterMap(str) {\n    const characterMap = {};\n  \n    for (let char of str.replace(/[^w]/g, \"\").toLowerCase())\n      characterMap[char] = characterMap[char] + 1 || 1;\n  \n    return characterMap;\n  }\n  \n  function isAnagrams(stringA, stringB) {\n    const stringAMap = buildCharMap(stringA);\n    const stringBMap = buildCharMap(stringB);\n  \n    for (let char in stringAMap) {\n      if (stringAMap[char] !== stringBMap[char]) {\n        return false;\n      }\n    }\n  \n    if (Object.keys(stringAMap).length !== Object.keys(stringBMap).length) {\n      return false;\n    }\n  \n    return true;\n  }\n  \n  /**\n   * @param {TreeNode} root\n   * @return {boolean}\n   */\n  function isBalanced(root) {\n    const height = getHeightBalanced(root);\n    return height !== Infinity;\n  }\n  \n  function getHeightBalanced(node) {\n    if (!node) {\n      return -1;\n    }\n  \n    const leftTreeHeight = getHeightBalanced(node.left);\n    const rightTreeHeight = getHeightBalanced(node.right);\n  \n    const heightDiff = Math.abs(leftTreeHeight - rightTreeHeight);\n  \n    if (\n      leftTreeHeight === Infinity ||\n      rightTreeHeight === Infinity ||\n      heightDiff > 1\n    ) {\n      return Infinity;\n    }\n  \n    const currentHeight = Math.max(leftTreeHeight, rightTreeHeight) + 1;\n    return currentHeight;\n  }\n  \n  window[\"__GLOBAL__HELPERS__\"] = {\n    buildCharacterMap,\n    isAnagrams,\n    isBalanced,\n    getHeightBalanced,\n  };\n  ")];
 /**
  * Adds dead code to blocks.
  *

package/dist/transforms/hexadecimalNumbers.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _transform = _interopRequireDefault(require("./transform"));
+
+var _order = require("../order");
+
+var _gen = require("../util/gen");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class HexadecimalNumbers extends _transform.default {
+  constructor(o) {
+    super(o, _order.ObfuscateOrder.HexadecimalNumbers);
+  }
+
+  match(object, parents) {
+    return object.type === "Literal" && typeof object.value === "number" && Math.floor(object.value) === object.value;
+  }
+
+  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));
+    };
+  }
+
+}
+
+exports.default = HexadecimalNumbers;

package/dist/transforms/minify.js

@@ -111,10 +111,15 @@ class Minify extends _transform.default {
           // Unnecessary return
           if (body.length && body[body.length - 1]) {
             var last = body[body.length - 1];
-            var isUndefined = last.argument == null;
 
-            if (last.type == "ReturnStatement" && isUndefined) {
-              body.pop();
+            if (last.type == "ReturnStatement") {
+              var isUndefined = last.argument == null;
+
+              if (isUndefined) {
+                if ((0, _insert.getFunction)(object, parents).body == object) {
+                  body.pop();
+                }
+              }
             }
           } // Variable declaration grouping
           // var a = 1;

package/package.json

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

package/src/compiler.ts

@@ -10,7 +10,11 @@ export default async function compileJs(tree: any, options: ObfuscateOptions) {
 }
 
 export function compileJsSync(tree: any, options: ObfuscateOptions): string {
-  var api: any = { format: escodegen.FORMAT_MINIFY };
+  var api: any = {
+    format: {
+      ...escodegen.FORMAT_MINIFY,
+    },
+  };
 
   if (!options.compact) {
     api = {};

package/src/obfuscator.ts

@@ -34,6 +34,7 @@ import StringCompression from "./transforms/string/stringCompression";
 import NameRecycling from "./transforms/identifier/nameRecycling";
 import AntiTooling from "./transforms/antiTooling";
 import HideInitializingCode from "./transforms/hideInitializingCode";
+import HexadecimalNumbers from "./transforms/hexadecimalNumbers";
 
 /**
  * The parent transformation holding the `state`.
@@ -96,6 +97,7 @@ export default class Obfuscator extends EventEmitter {
     test(options.stack, Stack);
     test(true, AntiTooling);
     test(options.hideInitializingCode, HideInitializingCode);
+    test(options.hexadecimalNumbers, HexadecimalNumbers);
 
     if (
       options.lock &&

package/src/options.ts

@@ -50,6 +50,13 @@ export interface ObfuscateOptions {
    */
   compact?: boolean;
 
+  /**
+   * ### `hexadecimalNumbers`
+   *
+   * Uses the hexadecimal representation (`50` -> `0x32`) for numbers. (`true/false`)
+   */
+  hexadecimalNumbers?: boolean;
+
   /**
    * ### `minify`
    *
@@ -676,6 +683,7 @@ const validProperties = new Set([
   "target",
   "indent",
   "compact",
+  "hexadecimalNumbers",
   "minify",
   "es5",
   "renameVariables",

package/src/order.ts

@@ -55,4 +55,6 @@ export enum ObfuscateOrder {
   StringEncoding = 32,
 
   AntiTooling = 34,
+
+  HexadecimalNumbers = 35,
 }

package/src/presets.ts

@@ -29,6 +29,7 @@ const highPreset: ObfuscateOptions = {
 
   calculator: true,
   compact: true,
+  hexadecimalNumbers: false,
   controlFlowFlattening: 0.75,
   deadCode: 0.2,
   dispatcher: true,
@@ -64,6 +65,7 @@ const mediumPreset: ObfuscateOptions = {
 
   calculator: true,
   compact: true,
+  hexadecimalNumbers: false,
   controlFlowFlattening: 0.5,
   deadCode: 0.025,
   dispatcher: 0.75,
@@ -92,6 +94,7 @@ const lowPreset: ObfuscateOptions = {
 
   calculator: true,
   compact: true,
+  hexadecimalNumbers: false,
   controlFlowFlattening: 0.25,
   deadCode: 0.01,
   dispatcher: 0.5,

package/src/transforms/controlFlowFlattening/controlFlowFlattening.ts

@@ -234,6 +234,9 @@ export default class ControlFlowFlattening extends Transform {
 
       var resultVar = this.getPlaceholder();
       var argVar = this.getPlaceholder();
+      var testVar = this.getPlaceholder();
+
+      var needsTestVar = false;
       var needsResultAndArgVar = false;
       var fnToLabel: { [fnName: string]: string } = Object.create(null);
 
@@ -478,7 +481,21 @@ export default class ControlFlowFlattening extends Transform {
                 finishCurrentChunk(isPostTest ? bodyPath : testPath, testPath);
 
                 currentBody.push(
-                  IfStatement(control.test || Literal(true), [
+                  ExpressionStatement(
+                    AssignmentExpression(
+                      "=",
+                      Identifier(testVar),
+                      control.test || Literal(true)
+                    )
+                  )
+                );
+
+                needsTestVar = true;
+
+                finishCurrentChunk();
+
+                currentBody.push(
+                  IfStatement(Identifier(testVar), [
                     {
                       type: "GotoStatement",
                       label: bodyPath,
@@ -522,6 +539,16 @@ export default class ControlFlowFlattening extends Transform {
           ) {
             finishCurrentChunk();
 
+            currentBody.push(
+              ExpressionStatement(
+                AssignmentExpression("=", Identifier(testVar), stmt.test)
+              )
+            );
+
+            needsTestVar = true;
+
+            finishCurrentChunk();
+
             var hasAlternate = !!stmt.alternate;
             ok(!(hasAlternate && stmt.alternate.type !== "BlockStatement"));
 
@@ -530,7 +557,7 @@ export default class ControlFlowFlattening extends Transform {
             var afterPath = this.getPlaceholder();
 
             currentBody.push(
-              IfStatement(stmt.test, [
+              IfStatement(Identifier(testVar), [
                 {
                   type: "GotoStatement",
                   label: yesPath,
@@ -975,6 +1002,10 @@ export default class ControlFlowFlattening extends Transform {
 
       var declarations = [];
 
+      if (needsTestVar) {
+        declarations.push(VariableDeclarator(testVar));
+      }
+
       if (needsResultAndArgVar) {
         declarations.push(VariableDeclarator(resultVar));
         declarations.push(VariableDeclarator(argVar));

package/src/transforms/deadCode.ts

@@ -124,6 +124,108 @@ function setCookie(cname, cvalue, exdays) {
 
     __.match(s + g);
   `),
+  Template(`
+  function vec_pack(vec) {
+    return vec[1] * 67108864 + (vec[0] < 0 ? 33554432 | vec[0] : vec[0]);
+  }
+  
+  function vec_unpack(number) {
+    switch (((number & 33554432) !== 0) * 1 + (number < 0) * 2) {
+      case 0:
+        return [number % 33554432, Math.trunc(number / 67108864)];
+      case 1:
+        return [
+          (number % 33554432) - 33554432,
+          Math.trunc(number / 67108864) + 1,
+        ];
+      case 2:
+        return [
+          (((number + 33554432) % 33554432) + 33554432) % 33554432,
+          Math.round(number / 67108864),
+        ];
+      case 3:
+        return [number % 33554432, Math.trunc(number / 67108864)];
+    }
+  }
+  
+  let a = vec_pack([2, 4]);
+  let b = vec_pack([1, 2]);
+  
+  let c = a + b; // Vector addition
+  let d = c - b; // Vector subtraction
+  let e = d * 2; // Scalar multiplication
+  let f = e / 2; // Scalar division
+  
+  console.log(vec_unpack(c)); // [3, 6]
+  console.log(vec_unpack(d)); // [2, 4]
+  console.log(vec_unpack(e)); // [4, 8]
+  console.log(vec_unpack(f)); // [2, 4]
+  `),
+  Template(`
+  function buildCharacterMap(str) {
+    const characterMap = {};
+  
+    for (let char of str.replace(/[^\w]/g, "").toLowerCase())
+      characterMap[char] = characterMap[char] + 1 || 1;
+  
+    return characterMap;
+  }
+  
+  function isAnagrams(stringA, stringB) {
+    const stringAMap = buildCharMap(stringA);
+    const stringBMap = buildCharMap(stringB);
+  
+    for (let char in stringAMap) {
+      if (stringAMap[char] !== stringBMap[char]) {
+        return false;
+      }
+    }
+  
+    if (Object.keys(stringAMap).length !== Object.keys(stringBMap).length) {
+      return false;
+    }
+  
+    return true;
+  }
+  
+  /**
+   * @param {TreeNode} root
+   * @return {boolean}
+   */
+  function isBalanced(root) {
+    const height = getHeightBalanced(root);
+    return height !== Infinity;
+  }
+  
+  function getHeightBalanced(node) {
+    if (!node) {
+      return -1;
+    }
+  
+    const leftTreeHeight = getHeightBalanced(node.left);
+    const rightTreeHeight = getHeightBalanced(node.right);
+  
+    const heightDiff = Math.abs(leftTreeHeight - rightTreeHeight);
+  
+    if (
+      leftTreeHeight === Infinity ||
+      rightTreeHeight === Infinity ||
+      heightDiff > 1
+    ) {
+      return Infinity;
+    }
+  
+    const currentHeight = Math.max(leftTreeHeight, rightTreeHeight) + 1;
+    return currentHeight;
+  }
+  
+  window["__GLOBAL__HELPERS__"] = {
+    buildCharacterMap,
+    isAnagrams,
+    isBalanced,
+    getHeightBalanced,
+  };
+  `),
 ];
 
 /**

package/src/transforms/hexadecimalNumbers.ts

@@ -0,0 +1,31 @@
+import Transform from "./transform";
+import { ObfuscateOrder } from "../order";
+import { ExitCallback } from "../traverse";
+import { Identifier, Node } from "../util/gen";
+
+export default class HexadecimalNumbers extends Transform {
+  constructor(o) {
+    super(o, ObfuscateOrder.HexadecimalNumbers);
+  }
+
+  match(object: Node, parents: Node[]): boolean {
+    return (
+      object.type === "Literal" &&
+      typeof object.value === "number" &&
+      Math.floor(object.value) === object.value
+    );
+  }
+
+  transform(object: Node, parents: Node[]): void | ExitCallback {
+    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, Identifier(newStr));
+    };
+  }
+}

package/src/transforms/minify.ts

@@ -21,6 +21,7 @@ import {
   clone,
   isForInitialize,
   isLexContext,
+  getFunction,
 } from "../util/insert";
 import { isValidIdentifier, isEquivalent } from "../util/compare";
 import { walk, isBlock } from "../traverse";
@@ -126,9 +127,14 @@ export default class Minify extends Transform {
           // Unnecessary return
           if (body.length && body[body.length - 1]) {
             var last = body[body.length - 1];
-            var isUndefined = last.argument == null;
-            if (last.type == "ReturnStatement" && isUndefined) {
-              body.pop();
+            if (last.type == "ReturnStatement") {
+              var isUndefined = last.argument == null;
+
+              if (isUndefined) {
+                if (getFunction(object, parents).body == object) {
+                  body.pop();
+                }
+              }
             }
           }
 

package/test/transforms/hexadecimalNumbers.test.ts

@@ -0,0 +1,62 @@
+import JsConfuser from "../../src/index";
+
+test("Variant #1: Positive integer to hexadecimal", async () => {
+  var output = await JsConfuser.obfuscate(`TEST_VAR = 10;`, {
+    target: "node",
+    hexadecimalNumbers: true,
+  });
+
+  expect(output).toContain("0xa");
+  expect(output).not.toContain("10");
+
+  var TEST_VAR;
+
+  eval(output);
+
+  expect(TEST_VAR).toStrictEqual(10);
+});
+
+test("Variant #2: Negative integer to hexadecimal", async () => {
+  var output = await JsConfuser.obfuscate(`TEST_VAR = -10;`, {
+    target: "node",
+    hexadecimalNumbers: true,
+  });
+
+  expect(output).toContain("-0xa");
+  expect(output).not.toContain("-10");
+
+  var TEST_VAR;
+
+  eval(output);
+
+  expect(TEST_VAR).toStrictEqual(-10);
+});
+
+test("Variant #3: Don't change floats", async () => {
+  var output = await JsConfuser.obfuscate(`var TEST_VAR = [15.5, -75.9];`, {
+    target: "node",
+    hexadecimalNumbers: true,
+  });
+
+  expect(output).toContain("15.5");
+  expect(output).toContain("-75.9");
+  expect(output).not.toContain("0x");
+});
+
+test("Variant #4: Work even on large numbers", async () => {
+  var output = await JsConfuser.obfuscate(
+    `TEST_VAR = 10000000000000000000000000000;`,
+    {
+      target: "node",
+      hexadecimalNumbers: true,
+    }
+  );
+
+  expect(output).toContain("0x204fce5e3e25020000000000");
+
+  var TEST_VAR;
+
+  eval(output);
+
+  expect(TEST_VAR).toStrictEqual(10000000000000000000000000000);
+});

package/test/transforms/minify.test.ts

@@ -261,3 +261,41 @@ test("Variant #14: Shorten 'var x = undefined' to 'var x'", async () => {
   expect(output).toContain("var x");
   expect(output).not.toContain("var x=");
 });
+
+test("Variant #15: Removing implied 'return'", async () => {
+  // Valid
+  var output = await JsConfuser(
+    `
+  function MyFunction(){ 
+    var output = "Hello World";
+    console.log(output);
+    return;
+  } 
+  
+  MyFunction();
+  `,
+    { target: "node", minify: true }
+  );
+
+  expect(output).not.toContain("return");
+
+  // Invalid
+  // https://github.com/MichaelXF/js-confuser/issues/34
+  var output2 = await JsConfuser(
+    `
+  function greet(){ 
+    if(true){ 
+      console.log("return"); 
+      return; 
+    }
+
+    var output = "should not show!"; console.log(output); 
+  } 
+  
+  greet();
+  `,
+    { target: "browser", minify: true }
+  );
+
+  expect(output2).toContain("return");
+});