mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-21 23:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for async ops using async/await

Browse source
This commit is contained in:
toby 2017-04-21 17:48:42 -04:00
parent 07bb095e73
commit c39622ed1e
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/Chef.js
View file

@ -34,7 +34,7 @@ var Chef = function() {
* @returns {number} response.duration - The number of ms it took to execute the recipe
* @returns {number} response.error - The error object thrown by a failed operation (false if no error)
*/
Chef.prototype.bake = function(inputText, recipeConfig, options, progress, step) {
Chef.prototype.bake = async function(inputText, recipeConfig, options, progress, step) {
var startTime = new Date().getTime(),
recipe = new Recipe(recipeConfig),
containsFc = recipe.containsFlowControl(),
@ -72,7 +72,7 @@ Chef.prototype.bake = function(inputText, recipeConfig, options, progress, step)
}
try {
progress = recipe.execute(this.dish, progress);
progress = await recipe.execute(this.dish, progress);
} catch (err) {
// Return the error in the result so that everything else gets correctly updated
// rather than throwing it here and losing state info.

4
src/core/FlowControl.js
View file

@ -38,7 +38,7 @@ const FlowControl = {
* @param {Operation[]} state.opList - The list of operations in the recipe.
* @returns {Object} The updated state of the recipe.
*/
runFork: function(state) {
runFork: async function(state) {
var opList = state.opList,
inputType = opList[state.progress].inputType,
outputType = opList[state.progress].outputType,
@ -73,7 +73,7 @@ const FlowControl = {
for (i = 0; i < inputs.length; i++) {
var dish = new Dish(inputs[i], inputType);
try {
progress = recipe.execute(dish, 0);
progress = await recipe.execute(dish, 0);
} catch (err) {
if (!ignoreErrors) {
throw err;

6
src/core/Recipe.js
View file

@ -145,7 +145,7 @@ Recipe.prototype.lastOpIndex = function(startIndex) {
* @param {number} [startFrom=0] - The index of the Operation to start executing from
* @returns {number} - The final progress through the recipe
*/
Recipe.prototype.execute = function(dish, startFrom) {
Recipe.prototype.execute = async function(dish, startFrom) {
startFrom = startFrom || 0;
var op, input, output, numJumps = 0;
@ -170,11 +170,11 @@ Recipe.prototype.execute = function(dish, startFrom) {
"numJumps" : numJumps
};
state = op.run(state);
state = await op.run(state);
i = state.progress;
numJumps = state.numJumps;
} else {
output = op.run(input, op.getIngValues());
output = await op.run(input, op.getIngValues());
dish.set(output, op.outputType);
}
} catch (err) {