mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 06:55:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update handling of bake errors.

Browse source 
Add preview thumbnail for image input.
This commit is contained in:
j433866 2019-05-01 17:08:36 +01:00
parent 1cedc94652
commit ff9c68db56
6 changed files with 193 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/core/ChefWorker.js
View file

@ -95,7 +95,7 @@ async function bake(data) {
self.loadRequiredModules(data.recipeConfig);
try {
self.inputNum = data.inputNum;
self.inputNum = parseInt(data.inputNum, 10);
const response = await self.chef.bake(
data.input, // The user's input
data.recipeConfig, // The configuration of the recipe
@ -104,13 +104,25 @@ async function bake(data) {
data.step // Whether or not to take one step or execute the whole recipe
);
if (typeof response.result === "string") {
self.postMessage({
action: "bakeComplete",
data: Object.assign(response, {
id: data.id,
inputNum: data.inputNum
})
});
if (response.progress !== data.progress + data.recipeConfig.length) {
self.postMessage({
action: "bakeError",
data: {
error: response.result,
id: data.id,
inputNum: data.inputNum,
progress: response.progress
}
});
} else {
self.postMessage({
action: "bakeComplete",
data: Object.assign(response, {
id: data.id,
inputNum: data.inputNum
})
});
}
} else {
self.postMessage({
action: "bakeComplete",
@ -123,10 +135,11 @@ async function bake(data) {
} catch (err) {
self.postMessage({
action: "bakeError",
data: Object.assign(err, {
data: {
error: err,
id: data.id,
inputNum: data.inputNum
})
}
});
}
self.inputNum = -1;