admin/javascript-obfuscator-javascript-obfuscator
1
0
Fork 0
mirror of https://github.com/javascript-obfuscator/javascript-obfuscator synced 2026-08-09 12:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

moving presets to the options folder

Browse Source 
BinaryExpressionControlFlowReplacer spec: increased samples count
This commit is contained in:
sanex3339
2016-12-18 14:37:40 +03:00
parent 4cd8020783
commit 34d1e95937
27 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Vendored
+13 -13
View File
@@ -1932,7 +1932,7 @@ var commander = __webpack_require__(118);
var path = __webpack_require__(36);
var SourceMapMode_1 = __webpack_require__(20);
var StringArrayEncoding_1 = __webpack_require__(23);
var DefaultPreset_1 = __webpack_require__(31);
var Default_1 = __webpack_require__(31);
var CLIUtils_1 = __webpack_require__(41);
var JavaScriptObfuscator_1 = __webpack_require__(16);
@@ -1962,7 +1962,7 @@ var JavaScriptObfuscatorCLI = function () {
key: "buildOptions",
value: function buildOptions() {
var inputOptions = {};
var availableOptions = Object.keys(DefaultPreset_1.DEFAULT_PRESET);
var availableOptions = Object.keys(Default_1.DEFAULT_PRESET);
for (var option in this.commands) {
if (!this.commands.hasOwnProperty(option)) {
continue;
@@ -1972,7 +1972,7 @@ var JavaScriptObfuscatorCLI = function () {
}
inputOptions[option] = this.commands[option];
}
return tslib_1.__assign({}, DefaultPreset_1.DEFAULT_PRESET, inputOptions);
return tslib_1.__assign({}, Default_1.DEFAULT_PRESET, inputOptions);
}
}, {
key: "configureCommands",
@@ -3054,7 +3054,7 @@ var format = __webpack_require__(10);
var ObfuscationEvents_1 = __webpack_require__(15);
var Initializable_1 = __webpack_require__(4);
var SingleNodeCallControllerTemplate_1 = __webpack_require__(99);
var NoCustomNodesPreset_1 = __webpack_require__(22);
var NoCustomNodes_1 = __webpack_require__(22);
var AbstractCustomNode_1 = __webpack_require__(8);
var JavaScriptObfuscator_1 = __webpack_require__(16);
var NodeCallsControllerFunctionNode = function (_AbstractCustomNode_) {
@@ -3078,7 +3078,7 @@ var NodeCallsControllerFunctionNode = function (_AbstractCustomNode_) {
if (this.appendEvent === ObfuscationEvents_1.ObfuscationEvents.AfterObfuscation) {
return JavaScriptObfuscator_1.JavaScriptObfuscator.obfuscate(format(SingleNodeCallControllerTemplate_1.SingleNodeCallControllerTemplate(), {
singleNodeCallControllerFunctionName: this.callsControllerFunctionName
}), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
return format(SingleNodeCallControllerTemplate_1.SingleNodeCallControllerTemplate(), {
singleNodeCallControllerFunctionName: this.callsControllerFunctionName
@@ -3113,7 +3113,7 @@ var inversify_1 = __webpack_require__(0);
var ServiceIdentifiers_1 = __webpack_require__(2);
var format = __webpack_require__(10);
var Initializable_1 = __webpack_require__(4);
var NoCustomNodesPreset_1 = __webpack_require__(22);
var NoCustomNodes_1 = __webpack_require__(22);
var SelfDefendingTemplate_1 = __webpack_require__(108);
var AbstractCustomNode_1 = __webpack_require__(8);
var JavaScriptObfuscator_1 = __webpack_require__(16);
@@ -3138,7 +3138,7 @@ var SelfDefendingUnicodeNode = function (_AbstractCustomNode_) {
return JavaScriptObfuscator_1.JavaScriptObfuscator.obfuscate(format(SelfDefendingTemplate_1.SelfDefendingTemplate(), {
selfDefendingFunctionName: RandomGeneratorUtils_1.RandomGeneratorUtils.getRandomVariableName(),
singleNodeCallControllerFunctionName: this.callsControllerFunctionName
}), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
}]);
@@ -3247,7 +3247,7 @@ var ServiceIdentifiers_1 = __webpack_require__(2);
var format = __webpack_require__(10);
var StringArrayEncoding_1 = __webpack_require__(23);
var Initializable_1 = __webpack_require__(4);
var NoCustomNodesPreset_1 = __webpack_require__(22);
var NoCustomNodes_1 = __webpack_require__(22);
var AtobTemplate_1 = __webpack_require__(97);
var Rc4Template_1 = __webpack_require__(98);
var SelfDefendingTemplate_1 = __webpack_require__(109);
@@ -3310,7 +3310,7 @@ var StringArrayCallsWrapper = function (_AbstractCustomNode_) {
decodeNodeTemplate: decodeNodeTemplate,
stringArrayCallsWrapperName: this.stringArrayCallsWrapperName,
stringArrayName: this.stringArrayName
}), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
}]);
@@ -3406,7 +3406,7 @@ var inversify_1 = __webpack_require__(0);
var ServiceIdentifiers_1 = __webpack_require__(2);
var format = __webpack_require__(10);
var Initializable_1 = __webpack_require__(4);
var NoCustomNodesPreset_1 = __webpack_require__(22);
var NoCustomNodes_1 = __webpack_require__(22);
var SelfDefendingTemplate_1 = __webpack_require__(114);
var StringArrayRotateFunctionTemplate_1 = __webpack_require__(115);
var AbstractCustomNode_1 = __webpack_require__(8);
@@ -3449,7 +3449,7 @@ var StringArrayRotateFunctionNode = function (_AbstractCustomNode_) {
stringArrayName: this.stringArrayName,
stringArrayRotateValue: Utils_1.Utils.decToHex(this.stringArrayRotateValue),
whileFunctionName: whileFunctionName
}), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode();
}
}]);
@@ -4804,13 +4804,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var tslib_1 = __webpack_require__(1);
var inversify_1 = __webpack_require__(0);
var class_validator_1 = __webpack_require__(117);
var DefaultPreset_1 = __webpack_require__(31);
var Default_1 = __webpack_require__(31);
var OptionsNormalizer_1 = __webpack_require__(87);
var ValidationErrorsFormatter_1 = __webpack_require__(88);
var Options = Options_1 = function Options(inputOptions) {
_classCallCheck(this, Options);
Object.assign(this, DefaultPreset_1.DEFAULT_PRESET, inputOptions);
Object.assign(this, Default_1.DEFAULT_PRESET, inputOptions);
var errors = class_validator_1.validateSync(this, Options_1.validatorOptions);
if (errors.length) {
throw new ReferenceError("Validation failed. errors:\n" + ValidationErrorsFormatter_1.ValidationErrorsFormatter.format(errors));
src/cli/JavaScriptObfuscatorCLI.ts
+1 -1
View File
@@ -9,7 +9,7 @@ import { IObfuscationResult } from '../interfaces/IObfuscationResult';
import { SourceMapMode } from '../enums/SourceMapMode';
import { StringArrayEncoding } from '../enums/StringArrayEncoding';
import { DEFAULT_PRESET } from '../preset-options/DefaultPreset';
import { DEFAULT_PRESET } from '../options/presets/Default';
import { CLIUtils } from './CLIUtils';
import { JavaScriptObfuscator } from '../JavaScriptObfuscator';
src/custom-nodes/node-calls-controller-nodes/NodeCallsControllerFunctionNode.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import { initializable } from '../../decorators/Initializable';
import { SingleNodeCallControllerTemplate } from '../../templates/custom-nodes/SingleNodeCallControllerTemplate';
import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes';
import { AbstractCustomNode } from '../AbstractCustomNode';
import { JavaScriptObfuscator } from '../../JavaScriptObfuscator';
src/custom-nodes/self-defending-nodes/SelfDefendingUnicodeNode.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import { IOptions } from '../../interfaces/options/IOptions';
import { initializable } from '../../decorators/Initializable';
import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes';
import { SelfDefendingTemplate } from '../../templates/custom-nodes/self-defending-nodes/self-defending-unicode-node/SelfDefendingTemplate';
src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts
+1 -1
View File
@@ -10,7 +10,7 @@ import { StringArrayEncoding } from '../../enums/StringArrayEncoding';
import { initializable } from '../../decorators/Initializable';
import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes';
import { AtobTemplate } from '../../templates/custom-nodes/AtobTemplate';
import { Rc4Template } from '../../templates/custom-nodes/Rc4Template';
src/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.ts
+1 -1
View File
@@ -8,7 +8,7 @@ import { IStorage } from '../../interfaces/storages/IStorage';
import { initializable } from '../../decorators/Initializable';
import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes';
import { SelfDefendingTemplate } from '../../templates/custom-nodes/string-array-nodes/string-array-rotate-function-node/SelfDefendingTemplate';
import { StringArrayRotateFunctionTemplate } from '../../templates/custom-nodes/string-array-nodes/string-array-rotate-function-node/StringArrayRotateFunctionTemplate';
src/options/Options.ts
+1 -1
View File
@@ -23,7 +23,7 @@ import { IOptions } from '../interfaces/options/IOptions';
import { TSourceMapMode } from '../types/TSourceMapMode';
import { TStringArrayEncoding } from '../types/options/TStringArrayEncoding';
import { DEFAULT_PRESET } from '../preset-options/DefaultPreset';
import { DEFAULT_PRESET } from './presets/Default';
import { OptionsNormalizer } from './OptionsNormalizer';
import { ValidationErrorsFormatter } from './ValidationErrorsFormatter';
src/preset-options/DefaultPreset.ts → src/options/presets/Default.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { TInputOptions } from '../types/options/TInputOptions';
import { TInputOptions } from '../../types/options/TInputOptions';
import { SourceMapMode } from '../enums/SourceMapMode';
import { SourceMapMode } from '../../enums/SourceMapMode';
export const DEFAULT_PRESET: TInputOptions = Object.freeze({
compact: true,
src/preset-options/NoCustomNodesPreset.ts → src/options/presets/NoCustomNodes.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { TInputOptions } from '../types/options/TInputOptions';
import { TInputOptions } from '../../types/options/TInputOptions';
import { SourceMapMode } from '../enums/SourceMapMode';
import { SourceMapMode } from '../../enums/SourceMapMode';
export const NO_CUSTOM_NODES_PRESET: TInputOptions = Object.freeze({
compact: true,
test/functional-tests/JavaScriptObfuscator.spec.ts
+2 -1
View File
@@ -6,7 +6,8 @@ import { IObfuscationResult } from '../../src/interfaces/IObfuscationResult';
import { JavaScriptObfuscator } from '../../src/JavaScriptObfuscator';
import { NO_CUSTOM_NODES_PRESET } from '../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../src/options/presets/NoCustomNodes';
import { readFileAsString } from '../helpers/readFileAsString';
import { RandomGeneratorUtils } from '../../src/utils/RandomGeneratorUtils';
test/functional-tests/JavaScriptObfuscatorInternal.spec.ts
+1 -1
View File
@@ -6,7 +6,7 @@ import { IInversifyContainerFacade } from '../../src/interfaces/container/IInver
import { IJavaScriptObfuscator } from '../../src/interfaces/IJavaScriptObfsucator';
import { IObfuscationResult } from '../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../src/options/presets/NoCustomNodes';
import { InversifyContainerFacade } from '../../src/container/InversifyContainerFacade';
test/functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/custom-nodes/string-array-nodes/StringArrayCallsWrapper.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/custom-nodes/string-array-nodes/StringArrayNode.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.spec.ts
+6 -4
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
import { readFileAsString } from '../../../../helpers/readFileAsString';
@@ -30,10 +30,12 @@ describe('BinaryExpressionControlFlowReplacer', () => {
});
describe('variant #2 - multiple binary expressions with threshold = 1', () => {
it('should replace binary expression node by call to control flow storage node', () => {
const samplesCount: number = 100;
it('should replace binary expression node by call to control flow storage node', function () {
this.timeout(4000);
const samplesCount: number = 200;
const expectedValue: number = 0.5;
const delta: number = 0.08;
const delta: number = 0.06;
let equalsValue: number = 0;
test/functional-tests/node-transformers/node-obfuscators/CatchClauseObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { readFileAsString } from '../../../helpers/readFileAsString';
test/functional-tests/node-transformers/node-obfuscators/FunctionDeclarationObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/node-transformers/node-obfuscators/FunctionObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/node-transformers/node-obfuscators/LabeledStatementObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { readFileAsString } from '../../../helpers/readFileAsString';
test/functional-tests/node-transformers/node-obfuscators/LiteralObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/node-transformers/node-obfuscators/MemberExpressionObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/node-transformers/node-obfuscators/MethodDefinitionObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/node-transformers/node-obfuscators/ObjectExpressionObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/functional-tests/node-transformers/node-obfuscators/VariableDeclarationObfuscator.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator';
test/unit-tests/options/OptionsNormalizer.spec.ts
+1 -1
View File
@@ -4,7 +4,7 @@ import { TInputOptions } from '../../../src/types/options/TInputOptions';
import { IOptions } from '../../../src/interfaces/options/IOptions';
import { DEFAULT_PRESET } from '../../../src/preset-options/DefaultPreset';
import { DEFAULT_PRESET } from '../../../src/options/presets/Default';
import { Options } from '../../../src/options/Options';
import { OptionsNormalizer } from '../../../src/options/OptionsNormalizer';