Added optimisations to numbersToExpressions option. Updated tests

dgilling · Jul 12, 2020 · 1beb3cd · 1beb3cd
1 parent dd8dcac
commit 1beb3cd
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 8 deletions.
diff --git a/dist/index.browser.js b/dist/index.browser.js
diff --git a/dist/index.cli.js b/dist/index.cli.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/analyzers/number-numerical-expression-analyzer/NumberNumericalExpressionAnalyzer.ts b/src/analyzers/number-numerical-expression-analyzer/NumberNumericalExpressionAnalyzer.ts
@@ -19,6 +19,11 @@ export class NumberNumericalExpressionAnalyzer implements INumberNumericalExpres
      */
     private static readonly additionalParts: number = 3;
 
+    /**
+     * @type {Map<number, number[]>}
+     */
+    private readonly numberFactorsMap: Map<number, number[]> = new Map();
+
     /**
      * @type {IRandomGenerator}
      */
@@ -103,11 +108,16 @@ export class NumberNumericalExpressionAnalyzer implements INumberNumericalExpres
     private mixWithMultiplyParts (number: number): number | number[] {
         const shouldMixWithMultiplyParts: boolean = this.randomGenerator.getMathRandom() > 0.5;
 
-        if (!shouldMixWithMultiplyParts) {
+        if (!shouldMixWithMultiplyParts || number === 0) {
             return number;
         }
 
-        const factors: number[] = NumberUtils.getFactors(number);
+        let factors: number[] | null = this.numberFactorsMap.get(number) ?? null;
+
+        if (!factors) {
+           factors = NumberUtils.getFactors(number);
+           this.numberFactorsMap.set(number, factors);
+        }
 
         if (!factors.length) {
             return number;

diff --git a/src/utils/NumberUtils.ts b/src/utils/NumberUtils.ts
@@ -82,12 +82,13 @@ export class NumberUtils {
 
         const factors: number[] = [];
 
+        const root: number = Math.sqrt(number);
         const isEven: boolean = number % 2 === 0;
         const incrementValue: number = isEven ? 1 : 2;
 
         for (
             let currentFactor = 1;
-            Math.pow(currentFactor, 2) <= number;
+            currentFactor <= root;
             currentFactor += incrementValue
         ) {
             if (number % currentFactor !== 0) {

diff --git a/test/dev/dev.ts b/test/dev/dev.ts
@@ -7,7 +7,7 @@ import { NO_ADDITIONAL_NODES_PRESET } from '../../src/options/presets/NoCustomNo
 
     let obfuscatedCode: string = JavaScriptObfuscator.obfuscate(
         `
-            const foo = 100;
+            const foo = 0;
             
             console.log(foo);
         `,

diff --git a/test/functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec.ts b/test/functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec.ts
@@ -810,6 +810,7 @@ describe('JavaScriptObfuscator', () => {
                         deadCodeInjection: true,
                         deadCodeInjectionThreshold: 1,
                         disableConsoleOutput: false,
+                        numbersToExpressions: true,
                         simplify: true,
                         renameProperties: true,
                         rotateStringArray: true,

diff --git a/test/runtime-tests/JavaScriptObfuscatorRuntime.spec.ts b/test/runtime-tests/JavaScriptObfuscatorRuntime.spec.ts
@@ -25,6 +25,7 @@ describe('JavaScriptObfuscator runtime eval', function () {
         debugProtection: true,
         disableConsoleOutput: true,
         domainLock: ['obfuscator.io'],
+        numbersToExpressions: true,
         simplify: true,
         renameProperties: true,
         reservedNames: ['generate', 'sha256'],