Improved new self defending code

src/custom-code-helpers/self-defending/templates/SelfDefendingTemplate.ts

@@ -11,7 +11,9 @@ export function SelfDefendingTemplate (escapeSequenceEncoder: IEscapeSequenceEnc
     return `
         const {selfDefendingFunctionName} = {callControllerFunctionName}(this, function () {
             const test = function () {
-                const regExp = new RegExp('^([^ ]+( +[^ ]+)+)+[^ ]}');
+                const regExp = test
+                    .constructor('return /" + this + "/')()
+                    .compile('^([^ ]+( +[^ ]+)+)+[^ ]}');
                 
                 return !regExp.test({selfDefendingFunctionName});
             };

test/dev/dev.ts

@@ -7,15 +7,13 @@ import { NO_ADDITIONAL_NODES_PRESET } from '../../src/options/presets/NoCustomNo
 
     let obfuscatedCode: string = JavaScriptObfuscator.obfuscate(
         `
-            var foo = 'foo';
+            (function () {
+                return 1;
+            })();
         `,
         {
             ...NO_ADDITIONAL_NODES_PRESET,
-            compact: false,
-            identifierNamesGenerator: 'mangled',
-            stringArray: true,
-            stringArrayThreshold: 1,
-            stringArrayEncoding: 'base64'
+            selfDefending: true
         }
     ).getObfuscatedCode();
 

test/functional-tests/custom-code-helpers/self-defending/templates/SelfDefendingTemplate.spec.ts

@@ -134,7 +134,7 @@ describe('SelfDefendingTemplate', function () {
     });
 
     describe('Variant #4: obfuscated code with beautified self defending code', () => {
-        const expectedEvaluationResult: number = 0;
+        const expectedEvaluationResult: number = 1;
 
         let obfuscatedCode: string,
             evaluationResult: number = 0;
@@ -153,20 +153,18 @@ describe('SelfDefendingTemplate', function () {
                 .replace(/function\(\){/g, 'function () {')
                 .replace(/=/g, ' = ')
                 .replace(/,/g, ', ')
-                .replace(/;/g, '; ')
-                .replace(/{/g, '{\n')
-                .replace(/}/g, '}\n');
+                .replace(/;/g, '; ');
 
             evaluateInWorker(
                 obfuscatedCode,
-                (response: number) => {
-                    evaluationResult = response;
+                () => {
                     done();
                 },
                 () => {
                     done();
                 },
                 () => {
+                    evaluationResult = 1;
                     done();
                 },
                 evaluationTimeout