Changed evaluationWorker helper

2026-08-09 12:42:29 +00:00 · 2020-02-19 10:12:39 +03:00
parent 5e61885f93
commit a5139779f9
4 changed files with 127 additions and 190 deletions
@@ -185,25 +185,24 @@ describe('JavaScriptObfuscator runtime eval', function () {
                        }
                    ).getObfuscatedCode();

-                    evaluateInWorker(
+                    return evaluateInWorker(
                        `
-                        ${getEnvironmentCode()}
-                        ${obfuscatedCode}
-                        module.exports.obfuscate('var foo = 1;').getObfuscatedCode();
-                    `,
-                        (response: string) => {
-                            evaluationResult = response;
-                            done();
-                        },
-                        (error: Error) => {
-                            evaluationResult = error.message;
-                            done();
-                        },
-                        () => {
-                            done();
-                        },
+                            ${getEnvironmentCode()}
+                            ${obfuscatedCode}
+                            module.exports.obfuscate('var foo = 1;').getObfuscatedCode();
+                        `,
                        evaluationTimeout
-                    );
+                    )
+                        .then((result: string | null) => {
+                            if (!result) {
+                                return;
+                            }
+
+                            evaluationResult = result;
+                        })
+                        .catch((error) => {
+                            evaluationResult = error.message;
+                        });
                });

                it('should obfuscate code without any runtime errors after obfuscation: Variant #3 obfuscator', () => {